diff options
author | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-01 18:51:50 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-07-12 18:35:11 -0400 |
commit | b8529ec1c1b0984d2baeda450c28eeb40efc87fe (patch) | |
tree | f05e326930e2870cecc408ff42b7fe717dd0a51e /arch/arm/plat-samsung/include/plat | |
parent | 8340417c666d7700e81ef72c863d8b3c0ca797fa (diff) |
ARM: S5PC100: no more support S5PC100 SoC
This patch removes supporting codes for s5pc100 because no more used
now.
[jason@lakedaemon.net: for drivers/irqchip/Kconfig]
Acked-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung/include/plat')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/cpu.h | 10 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/devs.h | 8 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/fb.h | 7 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/s5p-clock.h | 2 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/sdhci.h | 34 |
5 files changed, 1 insertions, 60 deletions
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h index 18e4365b0d26..d1d4659025bb 100644 --- a/arch/arm/plat-samsung/include/plat/cpu.h +++ b/arch/arm/plat-samsung/include/plat/cpu.h | |||
@@ -33,9 +33,6 @@ extern unsigned long samsung_cpu_id; | |||
33 | #define S3C6410_CPU_ID 0x36410000 | 33 | #define S3C6410_CPU_ID 0x36410000 |
34 | #define S3C64XX_CPU_MASK 0xFFFFF000 | 34 | #define S3C64XX_CPU_MASK 0xFFFFF000 |
35 | 35 | ||
36 | #define S5PC100_CPU_ID 0x43100000 | ||
37 | #define S5PC100_CPU_MASK 0xFFFFF000 | ||
38 | |||
39 | #define S5PV210_CPU_ID 0x43110000 | 36 | #define S5PV210_CPU_ID 0x43110000 |
40 | #define S5PV210_CPU_MASK 0xFFFFF000 | 37 | #define S5PV210_CPU_MASK 0xFFFFF000 |
41 | 38 | ||
@@ -50,7 +47,6 @@ IS_SAMSUNG_CPU(s3c24xx, S3C24XX_CPU_ID, S3C24XX_CPU_MASK) | |||
50 | IS_SAMSUNG_CPU(s3c2412, S3C2412_CPU_ID, S3C2412_CPU_MASK) | 47 | IS_SAMSUNG_CPU(s3c2412, S3C2412_CPU_ID, S3C2412_CPU_MASK) |
51 | IS_SAMSUNG_CPU(s3c6400, S3C6400_CPU_ID, S3C64XX_CPU_MASK) | 48 | IS_SAMSUNG_CPU(s3c6400, S3C6400_CPU_ID, S3C64XX_CPU_MASK) |
52 | IS_SAMSUNG_CPU(s3c6410, S3C6410_CPU_ID, S3C64XX_CPU_MASK) | 49 | IS_SAMSUNG_CPU(s3c6410, S3C6410_CPU_ID, S3C64XX_CPU_MASK) |
53 | IS_SAMSUNG_CPU(s5pc100, S5PC100_CPU_ID, S5PC100_CPU_MASK) | ||
54 | IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK) | 50 | IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK) |
55 | 51 | ||
56 | #if defined(CONFIG_CPU_S3C2410) || defined(CONFIG_CPU_S3C2412) || \ | 52 | #if defined(CONFIG_CPU_S3C2410) || defined(CONFIG_CPU_S3C2412) || \ |
@@ -80,12 +76,6 @@ IS_SAMSUNG_CPU(s5pv210, S5PV210_CPU_ID, S5PV210_CPU_MASK) | |||
80 | # define soc_is_s3c64xx() 0 | 76 | # define soc_is_s3c64xx() 0 |
81 | #endif | 77 | #endif |
82 | 78 | ||
83 | #if defined(CONFIG_CPU_S5PC100) | ||
84 | # define soc_is_s5pc100() is_samsung_s5pc100() | ||
85 | #else | ||
86 | # define soc_is_s5pc100() 0 | ||
87 | #endif | ||
88 | |||
89 | #if defined(CONFIG_CPU_S5PV210) | 79 | #if defined(CONFIG_CPU_S5PV210) |
90 | # define soc_is_s5pv210() is_samsung_s5pv210() | 80 | # define soc_is_s5pv210() is_samsung_s5pv210() |
91 | #else | 81 | #else |
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index ca66f5137f4b..5f5a28d08c2e 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h | |||
@@ -94,14 +94,6 @@ extern struct platform_device s5p_device_mixer; | |||
94 | extern struct platform_device s5p_device_onenand; | 94 | extern struct platform_device s5p_device_onenand; |
95 | extern struct platform_device s5p_device_sdo; | 95 | extern struct platform_device s5p_device_sdo; |
96 | 96 | ||
97 | extern struct platform_device s5pc100_device_ac97; | ||
98 | extern struct platform_device s5pc100_device_iis0; | ||
99 | extern struct platform_device s5pc100_device_iis1; | ||
100 | extern struct platform_device s5pc100_device_iis2; | ||
101 | extern struct platform_device s5pc100_device_pcm0; | ||
102 | extern struct platform_device s5pc100_device_pcm1; | ||
103 | extern struct platform_device s5pc100_device_spdif; | ||
104 | |||
105 | extern struct platform_device s5pv210_device_ac97; | 97 | extern struct platform_device s5pv210_device_ac97; |
106 | extern struct platform_device s5pv210_device_iis0; | 98 | extern struct platform_device s5pv210_device_iis0; |
107 | extern struct platform_device s5pv210_device_iis1; | 99 | extern struct platform_device s5pv210_device_iis1; |
diff --git a/arch/arm/plat-samsung/include/plat/fb.h b/arch/arm/plat-samsung/include/plat/fb.h index a400464c7a6d..5a0e26afb961 100644 --- a/arch/arm/plat-samsung/include/plat/fb.h +++ b/arch/arm/plat-samsung/include/plat/fb.h | |||
@@ -41,13 +41,6 @@ extern void s5p_fimd0_set_platdata(struct s3c_fb_platdata *pd); | |||
41 | extern void s3c64xx_fb_gpio_setup_24bpp(void); | 41 | extern void s3c64xx_fb_gpio_setup_24bpp(void); |
42 | 42 | ||
43 | /** | 43 | /** |
44 | * s5pc100_fb_gpio_setup_24bpp() - S5PC100 setup function for 24bpp LCD | ||
45 | * | ||
46 | * Initialise the GPIO for an 24bpp LCD display on the RGB interface. | ||
47 | */ | ||
48 | extern void s5pc100_fb_gpio_setup_24bpp(void); | ||
49 | |||
50 | /** | ||
51 | * s5pv210_fb_gpio_setup_24bpp() - S5PV210/S5PC110 setup function for 24bpp LCD | 44 | * s5pv210_fb_gpio_setup_24bpp() - S5PV210/S5PC110 setup function for 24bpp LCD |
52 | * | 45 | * |
53 | * Initialise the GPIO for an 24bpp LCD display on the RGB interface. | 46 | * Initialise the GPIO for an 24bpp LCD display on the RGB interface. |
diff --git a/arch/arm/plat-samsung/include/plat/s5p-clock.h b/arch/arm/plat-samsung/include/plat/s5p-clock.h index 8364b4bea8b8..acacc4b88a39 100644 --- a/arch/arm/plat-samsung/include/plat/s5p-clock.h +++ b/arch/arm/plat-samsung/include/plat/s5p-clock.h | |||
@@ -57,7 +57,7 @@ extern int s5p_gatectrl(void __iomem *reg, struct clk *clk, int enable); | |||
57 | extern int s5p_epll_enable(struct clk *clk, int enable); | 57 | extern int s5p_epll_enable(struct clk *clk, int enable); |
58 | extern unsigned long s5p_epll_get_rate(struct clk *clk); | 58 | extern unsigned long s5p_epll_get_rate(struct clk *clk); |
59 | 59 | ||
60 | /* SPDIF clk operations common for S5PC100/V210/C110 and Exynos4 */ | 60 | /* SPDIF clk operations common for S5PV210/C110 and Exynos4 */ |
61 | extern int s5p_spdif_set_rate(struct clk *clk, unsigned long rate); | 61 | extern int s5p_spdif_set_rate(struct clk *clk, unsigned long rate); |
62 | extern unsigned long s5p_spdif_get_rate(struct clk *clk); | 62 | extern unsigned long s5p_spdif_get_rate(struct clk *clk); |
63 | 63 | ||
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h index 7b2332fc7ac6..f84b6cbc8745 100644 --- a/arch/arm/plat-samsung/include/plat/sdhci.h +++ b/arch/arm/plat-samsung/include/plat/sdhci.h | |||
@@ -56,9 +56,6 @@ extern void s3c2416_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | |||
56 | extern void s3c2416_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | 56 | extern void s3c2416_setup_sdhci1_cfg_gpio(struct platform_device *, int w); |
57 | extern void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | 57 | extern void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *, int w); |
58 | extern void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | 58 | extern void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *, int w); |
59 | extern void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | ||
60 | extern void s5pc100_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | ||
61 | extern void s5pc100_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | ||
62 | extern void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *, int w); | 59 | extern void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *, int w); |
63 | extern void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *, int w); | 60 | extern void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *, int w); |
64 | extern void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *, int w); | 61 | extern void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *, int w); |
@@ -147,37 +144,6 @@ static inline void s3c6400_default_sdhci2(void) { } | |||
147 | 144 | ||
148 | #endif /* CONFIG_S3C64XX_SETUP_SDHCI */ | 145 | #endif /* CONFIG_S3C64XX_SETUP_SDHCI */ |
149 | 146 | ||
150 | /* S5PC100 SDHCI setup */ | ||
151 | |||
152 | #ifdef CONFIG_S5PC100_SETUP_SDHCI | ||
153 | static inline void s5pc100_default_sdhci0(void) | ||
154 | { | ||
155 | #ifdef CONFIG_S3C_DEV_HSMMC | ||
156 | s3c_hsmmc0_def_platdata.cfg_gpio = s5pc100_setup_sdhci0_cfg_gpio; | ||
157 | #endif | ||
158 | } | ||
159 | |||
160 | static inline void s5pc100_default_sdhci1(void) | ||
161 | { | ||
162 | #ifdef CONFIG_S3C_DEV_HSMMC1 | ||
163 | s3c_hsmmc1_def_platdata.cfg_gpio = s5pc100_setup_sdhci1_cfg_gpio; | ||
164 | #endif | ||
165 | } | ||
166 | |||
167 | static inline void s5pc100_default_sdhci2(void) | ||
168 | { | ||
169 | #ifdef CONFIG_S3C_DEV_HSMMC2 | ||
170 | s3c_hsmmc2_def_platdata.cfg_gpio = s5pc100_setup_sdhci2_cfg_gpio; | ||
171 | #endif | ||
172 | } | ||
173 | |||
174 | #else | ||
175 | static inline void s5pc100_default_sdhci0(void) { } | ||
176 | static inline void s5pc100_default_sdhci1(void) { } | ||
177 | static inline void s5pc100_default_sdhci2(void) { } | ||
178 | |||
179 | #endif /* CONFIG_S5PC100_SETUP_SDHCI */ | ||
180 | |||
181 | /* S5PV210 SDHCI setup */ | 147 | /* S5PV210 SDHCI setup */ |
182 | 148 | ||
183 | #ifdef CONFIG_S5PV210_SETUP_SDHCI | 149 | #ifdef CONFIG_S5PV210_SETUP_SDHCI |