ARM: S3C24XX: remove checks for CONFIG_CPU_S3C2413

Commit Message

Paul Bolle May 16, 2014, 12:02 p.m. UTC

There are a number of checks for CONFIG_CPU_S3C2413. But there's no
Kconfig symbol CPU_S3C2413. That symbol is not needed, as CPU_S3C2412 is
documented to support both the S3C2412 and the S3C2413 SoCs.

Luckily, all these checks for CONFIG_CPU_S3C2413 are in places were we
also checks for CONFIG_CPU_S3C2412. So these checks can safely be
removed.

Signed-off-by: Paul Bolle <[e-mail]>
---
Tested with git grep only.

I hope the ARM/SAMSUNG maintainers are allowed to touch s3c-i2s-v2.c in
this case.

Fun fact: the first checks for CONFIG_CPU_S3C2413 were added in commit
68d9ab394f06 ("[ARM] 3635/1: S3C24XX: Add S3C2412 core cpu support").
Perhaps it were leftovers of a preceding version of that patch.

 arch/arm/mach-s3c24xx/common.c                  | 2 +-
 arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 4 ++--
 arch/arm/plat-samsung/include/plat/map-s3c.h    | 2 +-
 sound/soc/samsung/s3c-i2s-v2.c                  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

Patch

diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index 1bc8e73c94f9..137eea8b156a 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -184,7 +184,7 @@  static unsigned long s3c24xx_read_idcode_v5(void)
 		return gs;
 #endif
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
 	return __raw_readl(S3C2412_GSTATUS1);
 #else
 	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 3415b60082d7..c143319c0396 100644
--- a/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
+++ b/arch/arm/mach-s3c24xx/include/mach/regs-clock.h
@@ -95,7 +95,7 @@ 
 
 #endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
 
 #define S3C2412_OSCSET		S3C2410_CLKREG(0x18)
 #define S3C2412_CLKSRC		S3C2410_CLKREG(0x1C)
@@ -159,7 +159,7 @@ 
 #define S3C2412_CLKSRC_UREFCLK_EXTCLK	(1<<12)
 #define S3C2412_CLKSRC_EREFCLK_EXTCLK	(1<<14)
 
-#endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */
+#endif /* CONFIG_CPU_S3C2412 */
 
 #define S3C2416_CLKDIV2		S3C2410_CLKREG(0x28)
 
diff --git a/arch/arm/plat-samsung/include/plat/map-s3c.h b/arch/arm/plat-samsung/include/plat/map-s3c.h
index c0c70a895ca8..612c2a71fffd 100644
--- a/arch/arm/plat-samsung/include/plat/map-s3c.h
+++ b/arch/arm/plat-samsung/include/plat/map-s3c.h
@@ -65,7 +65,7 @@ 
 
 /* deal with the registers that move under the 2412/2413 */
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413)
+#if defined(CONFIG_CPU_S3C2412)
 #ifndef __ASSEMBLY__
 extern void __iomem *s3c24xx_va_gpio2;
 #endif
diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
index 79e7efb9283c..9eea58382ab3 100644
--- a/sound/soc/samsung/s3c-i2s-v2.c
+++ b/sound/soc/samsung/s3c-i2s-v2.c
@@ -30,8 +30,8 @@ 
 
 #undef S3C_IIS_V2_SUPPORTED
 
-#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_CPU_S3C2413) \
-	|| defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_CPU_S5PV210)
+#if defined(CONFIG_CPU_S3C2412) || defined(CONFIG_ARCH_S3C64XX) \
+	|| defined(CONFIG_CPU_S5PV210)
 #define S3C_IIS_V2_SUPPORTED
 #endif