diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2014-02-13 20:39:45 -0500 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-02-13 20:40:15 -0500 |
commit | e9d428ee80150d9320823f6fb826dfacf54a6ead (patch) | |
tree | 48ca1fbde17368703168698758302805f1e3a0ef /arch/arm/plat-samsung | |
parent | 974b4334caebcfac81c96df40511143bb18e23dc (diff) |
ARM: SAMSUNG: Remove Exynos specific code from devs, s5p-pm-irq and pm-gpio.c
This file is only compiled when SAMSUNG_ATAGS is enabled, hence not
for Exynos platform.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
[kgene.kim@samsung.com: squashed into one]
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-samsung')
-rw-r--r-- | arch/arm/plat-samsung/devs.c | 10 | ||||
-rw-r--r-- | arch/arm/plat-samsung/pm-gpio.c | 5 | ||||
-rw-r--r-- | arch/arm/plat-samsung/s5p-irq-pm.c | 13 |
3 files changed, 4 insertions, 24 deletions
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 005f33375e4d..c64a39ac1b04 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) | |||
744 | if (!pd) { | 744 | if (!pd) { |
745 | pd = &default_i2c_data; | 745 | pd = &default_i2c_data; |
746 | 746 | ||
747 | if (soc_is_exynos4210() || | 747 | if (soc_is_s5pv210()) |
748 | soc_is_exynos4212() || soc_is_exynos4412()) | ||
749 | pd->bus_num = 8; | ||
750 | else if (soc_is_s5pv210()) | ||
751 | pd->bus_num = 3; | 748 | pd->bus_num = 3; |
752 | else | 749 | else |
753 | pd->bus_num = 0; | 750 | pd->bus_num = 0; |
@@ -764,10 +761,7 @@ void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info, | |||
764 | { | 761 | { |
765 | struct s5p_hdmi_platform_data *pd = &s5p_hdmi_def_platdata; | 762 | struct s5p_hdmi_platform_data *pd = &s5p_hdmi_def_platdata; |
766 | 763 | ||
767 | if (soc_is_exynos4210() || | 764 | if (soc_is_s5pv210()) |
768 | soc_is_exynos4212() || soc_is_exynos4412()) | ||
769 | pd->hdmiphy_bus = 8; | ||
770 | else if (soc_is_s5pv210()) | ||
771 | pd->hdmiphy_bus = 3; | 765 | pd->hdmiphy_bus = 3; |
772 | else | 766 | else |
773 | pd->hdmiphy_bus = 0; | 767 | pd->hdmiphy_bus = 0; |
diff --git a/arch/arm/plat-samsung/pm-gpio.c b/arch/arm/plat-samsung/pm-gpio.c index dd4c15d0d68f..da268813901b 100644 --- a/arch/arm/plat-samsung/pm-gpio.c +++ b/arch/arm/plat-samsung/pm-gpio.c | |||
@@ -196,8 +196,7 @@ struct samsung_gpio_pm samsung_gpio_pm_2bit = { | |||
196 | .resume = samsung_gpio_pm_2bit_resume, | 196 | .resume = samsung_gpio_pm_2bit_resume, |
197 | }; | 197 | }; |
198 | 198 | ||
199 | #if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P) \ | 199 | #if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P) |
200 | || defined(CONFIG_ARCH_EXYNOS) | ||
201 | static void samsung_gpio_pm_4bit_save(struct samsung_gpio_chip *chip) | 200 | static void samsung_gpio_pm_4bit_save(struct samsung_gpio_chip *chip) |
202 | { | 201 | { |
203 | chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON); | 202 | chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON); |
@@ -307,7 +306,7 @@ struct samsung_gpio_pm samsung_gpio_pm_4bit = { | |||
307 | .save = samsung_gpio_pm_4bit_save, | 306 | .save = samsung_gpio_pm_4bit_save, |
308 | .resume = samsung_gpio_pm_4bit_resume, | 307 | .resume = samsung_gpio_pm_4bit_resume, |
309 | }; | 308 | }; |
310 | #endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P || CONFIG_ARCH_EXYNOS */ | 309 | #endif /* CONFIG_ARCH_S3C64XX || CONFIG_PLAT_S5P */ |
311 | 310 | ||
312 | /** | 311 | /** |
313 | * samsung_pm_save_gpio() - save gpio chip data for suspend | 312 | * samsung_pm_save_gpio() - save gpio chip data for suspend |
diff --git a/arch/arm/plat-samsung/s5p-irq-pm.c b/arch/arm/plat-samsung/s5p-irq-pm.c index 591498035916..52b16943617e 100644 --- a/arch/arm/plat-samsung/s5p-irq-pm.c +++ b/arch/arm/plat-samsung/s5p-irq-pm.c | |||
@@ -22,10 +22,7 @@ | |||
22 | #include <mach/map.h> | 22 | #include <mach/map.h> |
23 | 23 | ||
24 | #include <mach/regs-gpio.h> | 24 | #include <mach/regs-gpio.h> |
25 | |||
26 | #ifndef CONFIG_ARCH_EXYNOS | ||
27 | #include <mach/regs-irq.h> | 25 | #include <mach/regs-irq.h> |
28 | #endif | ||
29 | 26 | ||
30 | /* state for IRQs over sleep */ | 27 | /* state for IRQs over sleep */ |
31 | 28 | ||
@@ -43,18 +40,8 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state) | |||
43 | unsigned long irqbit; | 40 | unsigned long irqbit; |
44 | unsigned int irq_rtc_tic, irq_rtc_alarm; | 41 | unsigned int irq_rtc_tic, irq_rtc_alarm; |
45 | 42 | ||
46 | #ifdef CONFIG_ARCH_EXYNOS | ||
47 | if (soc_is_exynos5250()) { | ||
48 | irq_rtc_tic = EXYNOS5_IRQ_RTC_TIC; | ||
49 | irq_rtc_alarm = EXYNOS5_IRQ_RTC_ALARM; | ||
50 | } else { | ||
51 | irq_rtc_tic = EXYNOS4_IRQ_RTC_TIC; | ||
52 | irq_rtc_alarm = EXYNOS4_IRQ_RTC_ALARM; | ||
53 | } | ||
54 | #else | ||
55 | irq_rtc_tic = IRQ_RTC_TIC; | 43 | irq_rtc_tic = IRQ_RTC_TIC; |
56 | irq_rtc_alarm = IRQ_RTC_ALARM; | 44 | irq_rtc_alarm = IRQ_RTC_ALARM; |
57 | #endif | ||
58 | 45 | ||
59 | if (data->irq == irq_rtc_tic || data->irq == irq_rtc_alarm) { | 46 | if (data->irq == irq_rtc_tic || data->irq == irq_rtc_alarm) { |
60 | irqbit = 1 << (data->irq + 1 - irq_rtc_alarm); | 47 | irqbit = 1 << (data->irq + 1 - irq_rtc_alarm); |