Commit e9d428ee authored by Tushar Behera's avatar Tushar Behera Committed by Kukjin Kim

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: default avatarTushar Behera <tushar.behera@linaro.org>
[kgene.kim@samsung.com: squashed into one]
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 974b4334
...@@ -744,10 +744,7 @@ void __init s5p_i2c_hdmiphy_set_platdata(struct s3c2410_platform_i2c *pd) ...@@ -744,10 +744,7 @@ void __init s5p_i2c_hdmiphy_set_platdata(struct s3c2410_platform_i2c *pd)
if (!pd) { if (!pd) {
pd = &default_i2c_data; pd = &default_i2c_data;
if (soc_is_exynos4210() || if (soc_is_s5pv210())
soc_is_exynos4212() || soc_is_exynos4412())
pd->bus_num = 8;
else if (soc_is_s5pv210())
pd->bus_num = 3; pd->bus_num = 3;
else else
pd->bus_num = 0; pd->bus_num = 0;
...@@ -764,10 +761,7 @@ void __init s5p_hdmi_set_platdata(struct i2c_board_info *hdmiphy_info, ...@@ -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; struct s5p_hdmi_platform_data *pd = &s5p_hdmi_def_platdata;
if (soc_is_exynos4210() || if (soc_is_s5pv210())
soc_is_exynos4212() || soc_is_exynos4412())
pd->hdmiphy_bus = 8;
else if (soc_is_s5pv210())
pd->hdmiphy_bus = 3; pd->hdmiphy_bus = 3;
else else
pd->hdmiphy_bus = 0; pd->hdmiphy_bus = 0;
......
...@@ -196,8 +196,7 @@ struct samsung_gpio_pm samsung_gpio_pm_2bit = { ...@@ -196,8 +196,7 @@ struct samsung_gpio_pm samsung_gpio_pm_2bit = {
.resume = samsung_gpio_pm_2bit_resume, .resume = samsung_gpio_pm_2bit_resume,
}; };
#if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P) \ #if defined(CONFIG_ARCH_S3C64XX) || defined(CONFIG_PLAT_S5P)
|| defined(CONFIG_ARCH_EXYNOS)
static void samsung_gpio_pm_4bit_save(struct samsung_gpio_chip *chip) static void samsung_gpio_pm_4bit_save(struct samsung_gpio_chip *chip)
{ {
chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON); chip->pm_save[1] = __raw_readl(chip->base + OFFS_CON);
...@@ -307,7 +306,7 @@ struct samsung_gpio_pm samsung_gpio_pm_4bit = { ...@@ -307,7 +306,7 @@ struct samsung_gpio_pm samsung_gpio_pm_4bit = {
.save = samsung_gpio_pm_4bit_save, .save = samsung_gpio_pm_4bit_save,
.resume = samsung_gpio_pm_4bit_resume, .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 * samsung_pm_save_gpio() - save gpio chip data for suspend
......
...@@ -22,10 +22,7 @@ ...@@ -22,10 +22,7 @@
#include <mach/map.h> #include <mach/map.h>
#include <mach/regs-gpio.h> #include <mach/regs-gpio.h>
#ifndef CONFIG_ARCH_EXYNOS
#include <mach/regs-irq.h> #include <mach/regs-irq.h>
#endif
/* state for IRQs over sleep */ /* state for IRQs over sleep */
...@@ -43,18 +40,8 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state) ...@@ -43,18 +40,8 @@ int s3c_irq_wake(struct irq_data *data, unsigned int state)
unsigned long irqbit; unsigned long irqbit;
unsigned int irq_rtc_tic, irq_rtc_alarm; 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_tic = IRQ_RTC_TIC;
irq_rtc_alarm = IRQ_RTC_ALARM; irq_rtc_alarm = IRQ_RTC_ALARM;
#endif
if (data->irq == irq_rtc_tic || data->irq == irq_rtc_alarm) { if (data->irq == irq_rtc_tic || data->irq == irq_rtc_alarm) {
irqbit = 1 << (data->irq + 1 - irq_rtc_alarm); irqbit = 1 << (data->irq + 1 - irq_rtc_alarm);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment