Commit 2c80920f authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: exynos: Remove legacy setting of external wakeup interrupts 



Since Exynos/S5Pv210 pin-controller driver is taking care about setting
the external wakeup interrupts mask, the legacy code can be removed.

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <snawrocki@kernel.org>
Acked-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
parent 383acb0d

arch/arm/mach-exynos/common.h

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ bool __init exynos_secure_firmware_available(void); 
void exynos_set_boot_flag(unsigned int cpu, unsigned int mode);

void exynos_clear_boot_flag(unsigned int cpu, unsigned int mode);



extern u32 exynos_get_eint_wake_mask(void);



#ifdef CONFIG_PM_SLEEP

extern void __init exynos_pm_init(void);

#else

arch/arm/mach-exynos/suspend.c

+12 −4
Original line number Diff line number Diff line
@@ -93,6 +93,11 @@ static const struct exynos_wkup_irq exynos5250_wkup_irq[] = { 
	{ /* sentinel */ },

};



static u32 exynos_read_eint_wakeup_mask(void)

{

	return pmu_raw_readl(EXYNOS_EINT_WAKEUP_MASK);

}



static int exynos_irq_set_wake(struct irq_data *data, unsigned int state)

{

	const struct exynos_wkup_irq *wkup_irq;
@@ -277,8 +282,10 @@ static int exynos5420_cpu_suspend(unsigned long arg) 


static void exynos_pm_set_wakeup_mask(void)

{

	/* Set wake-up mask registers */

	pmu_raw_writel(exynos_get_eint_wake_mask(), EXYNOS_EINT_WAKEUP_MASK);

	/*

	 * Set wake-up mask registers

	 * EXYNOS_EINT_WAKEUP_MASK is set by pinctrl driver in late suspend.

	 */

	pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);

}
@@ -488,6 +495,7 @@ early_wakeup: 


static int exynos_suspend_enter(suspend_state_t state)

{

	u32 eint_wakeup_mask = exynos_read_eint_wakeup_mask();

	int ret;



	s3c_pm_debug_init();
@@ -495,10 +503,10 @@ static int exynos_suspend_enter(suspend_state_t state) 
	S3C_PMDBG("%s: suspending the system...\n", __func__);



	S3C_PMDBG("%s: wakeup masks: %08x,%08x\n", __func__,

			exynos_irqwake_intmask, exynos_get_eint_wake_mask());

		  exynos_irqwake_intmask, eint_wakeup_mask);



	if (exynos_irqwake_intmask == -1U

	    && exynos_get_eint_wake_mask() == -1U) {

	    && eint_wakeup_mask == EXYNOS_EINT_WAKEUP_MASK_DISABLED) {

		pr_err("%s: No wake-up sources!\n", __func__);

		pr_err("%s: Aborting sleep\n", __func__);

		return -EINVAL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE