Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/arm/plat-samsung/devs.c

+2 −8
Original line number Diff line number Diff line
@@ -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;

arch/arm/plat-samsung/pm-gpio.c

+2 −3
Original line number Diff line number Diff line
@@ -196,8 +196,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);
@@ -307,7 +306,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

arch/arm/plat-samsung/s5p-irq-pm.c

+0 −13
Original line number Diff line number Diff line
@@ -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);