diff options
author | Krzysztof Kozlowski <krzk@kernel.org> | 2017-07-17 01:48:07 -0400 |
---|---|---|
committer | Krzysztof Kozlowski <krzk@kernel.org> | 2017-07-20 01:17:43 -0400 |
commit | f0f2f59977b69147b2e037906687d77b484d78e0 (patch) | |
tree | fdf911b8daf1b7cea5ee0dd681052727544cb7cc /arch/arm | |
parent | 5771a8c08880cdca3bfb4a3fc6d309d6bba20877 (diff) |
ARM: s3c24xx: Remove non-existing CONFIG_CPU_S3C2413
There is no CONFIG_CPU_S3C2413 so get rid of it.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-s3c24xx/common.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 4 | ||||
-rw-r--r-- | arch/arm/plat-samsung/include/plat/map-s3c.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index b59f4f4f256f..5b6b94ef41e2 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c | |||
@@ -173,7 +173,7 @@ static unsigned long s3c24xx_read_idcode_v5(void) | |||
173 | return gs; | 173 | return gs; |
174 | #endif | 174 | #endif |
175 | 175 | ||
176 | #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) | 176 | #if defined(CONFIG_CPU_S3C2412) |
177 | return __raw_readl(S3C2412_GSTATUS1); | 177 | return __raw_readl(S3C2412_GSTATUS1); |
178 | #else | 178 | #else |
179 | return 1UL; /* don't look like an 2400 */ | 179 | return 1UL; /* don't look like an 2400 */ |
diff --git a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h index 3db6c10de023..ae4a3e0f3ba2 100644 --- a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h +++ b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h | |||
@@ -77,7 +77,7 @@ | |||
77 | 77 | ||
78 | #endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */ | 78 | #endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */ |
79 | 79 | ||
80 | #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) | 80 | #if defined(CONFIG_CPU_S3C2412) |
81 | 81 | ||
82 | #define S3C2412_OSCSET S3C2410_CLKREG(0x18) | 82 | #define S3C2412_OSCSET S3C2410_CLKREG(0x18) |
83 | #define S3C2412_CLKSRC S3C2410_CLKREG(0x1C) | 83 | #define S3C2412_CLKSRC S3C2410_CLKREG(0x1C) |
@@ -141,7 +141,7 @@ | |||
141 | #define S3C2412_CLKSRC_UREFCLK_EXTCLK (1<<12) | 141 | #define S3C2412_CLKSRC_UREFCLK_EXTCLK (1<<12) |
142 | #define S3C2412_CLKSRC_EREFCLK_EXTCLK (1<<14) | 142 | #define S3C2412_CLKSRC_EREFCLK_EXTCLK (1<<14) |
143 | 143 | ||
144 | #endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */ | 144 | #endif /* CONFIG_CPU_S3C2412 */ |
145 | 145 | ||
146 | #define S3C2416_CLKDIV2 S3C2410_CLKREG(0x28) | 146 | #define S3C2416_CLKDIV2 S3C2410_CLKREG(0x28) |
147 | 147 | ||
diff --git a/arch/arm/plat-samsung/include/plat/map-s3c.h b/arch/arm/plat-samsung/include/plat/map-s3c.h index 6feedd47d875..33104911862e 100644 --- a/arch/arm/plat-samsung/include/plat/map-s3c.h +++ b/arch/arm/plat-samsung/include/plat/map-s3c.h | |||
@@ -61,7 +61,7 @@ | |||
61 | 61 | ||
62 | /* deal with the registers that move under the 2412/2413 */ | 62 | /* deal with the registers that move under the 2412/2413 */ |
63 | 63 | ||
64 | #if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) | 64 | #if defined(CONFIG_CPU_S3C2412) |
65 | #ifndef __ASSEMBLY__ | 65 | #ifndef __ASSEMBLY__ |
66 | extern void __iomem *s3c24xx_va_gpio2; | 66 | extern void __iomem *s3c24xx_va_gpio2; |
67 | #endif | 67 | #endif |