[PATCH 0/3] Remove Exynos specific code from legacy files

[PATCH 0/3] Remove Exynos specific code from legacy files

[Tushar Behera]

No need to maintain Exynos specific codes for legacy files as they
are not compiled for Exynos platforms. Remove any reference to Exynos
from those files.

Tushar Behera (3):
  ARM: SAMSUNG: Remove Exynos specific code from devs.c
  ARM: SAMSUNG: Remove Exynos specific code from s5p-pm-irq.c
  ARM: SAMSUNG: Remove Exynos specific code from pm-gpio.c

 arch/arm/plat-samsung/devs.c       |   10 ++--------
 arch/arm/plat-samsung/pm-gpio.c    |    5 ++---
 arch/arm/plat-samsung/s5p-irq-pm.c |   13 -------------
 3 files changed, 4 insertions(+), 24 deletions(-)

-- 
1.7.9.5

[PATCH 1/3] ARM: SAMSUNG: Remove Exynos specific code from devs.c

[Tushar Behera]

This file is only compiled when SAMSUNG_ATAGS is enabled, hence not
for Exynos platform.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
---
 arch/arm/plat-samsung/devs.c |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index ac07e87..ea41444 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -744,10 +744,7 @@ void __init s5p_i2c_hdmiphy_set_platdata(struct s3c2410_platform_i2c *pd)
 	if (!pd) {
 		pd = &default_i2c_data;
 
-		if (soc_is_exynos4210() ||
-		    soc_is_exynos4212() || soc_is_exynos4412())
-			pd->bus_num = 8;
-		else if (soc_is_s5pv210())
+		if (soc_is_s5pv210())
 			pd->bus_num = 3;
 		else
 			pd->bus_num = 0;
@@ -764,10 +761,7 @@ void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info,
 {
 	struct s5p_hdmi_platform_data *pd = &s5p_hdmi_def_platdata;
 
-	if (soc_is_exynos4210() ||
-	    soc_is_exynos4212() || soc_is_exynos4412())
-		pd->hdmiphy_bus = 8;
-	else if (soc_is_s5pv210())
+	if (soc_is_s5pv210())
 		pd->hdmiphy_bus = 3;
 	else
 		pd->hdmiphy_bus = 0;
-- 
1.7.9.5

[PATCH 2/3] ARM: SAMSUNG: Remove Exynos specific code from s5p-pm-irq.c

[Tushar Behera]

This file is only compiled when SAMSUNG_ATAGS is enabled, hence not
for Exynos platform.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
---
 arch/arm/plat-samsung/s5p-irq-pm.c |   13 -------------
 1 file changed, 13 deletions(-)

diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c
index 5914980..52b1694 100644
--- a/arch/arm/plat-samsung/s5p-irq-pm.c
+++ b/arch/arm/plat-samsung/s5p-irq-pm.c
@@ -22,10 +22,7 @@
 #include <mach/map.h>
 
 #include <mach/regs-gpio.h>
-
-#ifndef CONFIG_ARCH_EXYNOS
 #include <mach/regs-irq.h>
-#endif
 
 /* state for IRQs over sleep */
 
@@ -43,18 +40,8 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state)
 	unsigned long irqbit;
 	unsigned int irq_rtc_tic, irq_rtc_alarm;
 
-#ifdef CONFIG_ARCH_EXYNOS
-	if (soc_is_exynos5250()) {
-		irq_rtc_tic = EXYNOS5_IRQ_RTC_TIC;
-		irq_rtc_alarm = EXYNOS5_IRQ_RTC_ALARM;
-	} else {
-		irq_rtc_tic = EXYNOS4_IRQ_RTC_TIC;
-		irq_rtc_alarm = EXYNOS4_IRQ_RTC_ALARM;
-	}
-#else
 	irq_rtc_tic = IRQ_RTC_TIC;
 	irq_rtc_alarm = IRQ_RTC_ALARM;
-#endif
 
 	if (data->irq == irq_rtc_tic || data->irq == irq_rtc_alarm) {
 		irqbit = 1 << (data->irq + 1 - irq_rtc_alarm);
-- 
1.7.9.5

[PATCH 3/3] ARM: SAMSUNG: Remove Exynos specific code from pm-gpio.c

[Tushar Behera]

This file is only compiled when SAMSUNG_ATAGS is enabled, hence not
for Exynos platform.

Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
---
 arch/arm/plat-samsung/pm-gpio.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c
index c4efa1c..81b0a20 100644
--- a/arch/arm/plat-samsung/pm-gpio.c
+++ b/arch/arm/plat-samsung/pm-gpio.c
@@ -198,8 +198,7 @@ struct samsung_gpio_pm samsung_gpio_pm_2bit = {
 	.resume = samsung_gpio_pm_2bit_resume,
 };
 
-#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P) \
-	|| defined(CONFIG_ARCH_EXYNOS)
+#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
 static void samsung_gpio_pm_4bit_save(struct samsung_gpio_chip *chip)
 {
 	chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
@@ -309,7 +308,7 @@ struct samsung_gpio_pm samsung_gpio_pm_4bit = {
 	.save	= samsung_gpio_pm_4bit_save,
 	.resume = samsung_gpio_pm_4bit_resume,
 };
-#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P || CONFIG_ARCH_EXYNOS */
+#endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */
 
 /**
  * samsung_pm_save_gpio() - save gpio chip data for suspend
-- 
1.7.9.5

RE: [PATCH 0/3] Remove Exynos specific code from legacy files

[kgene]

Tushar Behera wrote:
> 
> No need to maintain Exynos specific codes for legacy files as they
> are not compiled for Exynos platforms. Remove any reference to Exynos
> from those files.
> 
> Tushar Behera (3):
>   ARM: SAMSUNG: Remove Exynos specific code from devs.c
>   ARM: SAMSUNG: Remove Exynos specific code from s5p-pm-irq.c
>   ARM: SAMSUNG: Remove Exynos specific code from pm-gpio.c
> 
>  arch/arm/plat-samsung/devs.c       |   10 ++--------
>  arch/arm/plat-samsung/pm-gpio.c    |    5 ++---
>  arch/arm/plat-samsung/s5p-irq-pm.c |   13 -------------
>  3 files changed, 4 insertions(+), 24 deletions(-)
> 
OK, looks good to me.
Applied but I squashed into one commit because of one change.

Thanks,
Kukjin