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: Krzysztof Kozlowski <krzk@kernel.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Sylwester Nawrocki <snawrocki@kernel.org>
Acked-by: Tomasz Figa <tomasz.figa@gmail.com>
Change-Id: I71e5b93c091f24a73c0df803c47f30320d3fe07b

diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 3f715524c9d6e05a29b9ae15c9a99dcac56807a0..f4bb2c7dfb9f5aa7b1de90fd2e3f47752867b4d7 100644 (file)
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -128,8 +128,6 @@ void exynos_firmware_init(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

diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
index 5991db0a762b9c447ee37d847225842a72cf20ea..14a0558b7e701ca88ce1dae349afd40059d1e694 100644 (file)
--- a/arch/arm/mach-exynos/suspend.c
+++ b/arch/arm/mach-exynos/suspend.c
@@ -94,6 +94,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;
@@ -278,8 +283,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);
 }
 
@@ -489,6 +496,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();
@@ -496,10 +504,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;