Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: s5pv210: 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>

+12 -5
-1
arch/arm/mach-s5pv210/common.h
··· 10 10 #define __ARCH_ARM_MACH_S5PV210_COMMON_H 11 11 12 12 #ifdef CONFIG_PM_SLEEP 13 - u32 exynos_get_eint_wake_mask(void); 14 13 void s5pv210_cpu_resume(void); 15 14 void s5pv210_pm_init(void); 16 15 #else
+12 -4
arch/arm/mach-s5pv210/pm.c
··· 32 32 */ 33 33 static u32 s5pv210_irqwake_intmask = 0xffffffff; 34 34 35 + static u32 s5pv210_read_eint_wakeup_mask(void) 36 + { 37 + return __raw_readl(S5P_EINT_WAKEUP_MASK); 38 + } 39 + 35 40 /* 36 41 * Suspend helpers. 37 42 */ ··· 64 59 { 65 60 unsigned int tmp; 66 61 67 - /* Set wake-up mask registers */ 68 - __raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK); 62 + /* 63 + * Set wake-up mask registers 64 + * S5P_EINT_WAKEUP_MASK is set by pinctrl driver in late suspend. 65 + */ 69 66 __raw_writel(s5pv210_irqwake_intmask, S5P_WAKEUP_MASK); 70 67 71 68 /* ensure at least INFORM0 has the resume address */ ··· 96 89 */ 97 90 static int s5pv210_suspend_enter(suspend_state_t state) 98 91 { 92 + u32 eint_wakeup_mask = s5pv210_read_eint_wakeup_mask(); 99 93 int ret; 100 94 101 95 s3c_pm_debug_init(); ··· 104 96 S3C_PMDBG("%s: suspending the system...\n", __func__); 105 97 106 98 S3C_PMDBG("%s: wakeup masks: %08x,%08x\n", __func__, 107 - s5pv210_irqwake_intmask, exynos_get_eint_wake_mask()); 99 + s5pv210_irqwake_intmask, eint_wakeup_mask); 108 100 109 101 if (s5pv210_irqwake_intmask == -1U 110 - && exynos_get_eint_wake_mask() == -1U) { 102 + && eint_wakeup_mask == -1U) { 111 103 pr_err("%s: No wake-up sources!\n", __func__); 112 104 pr_err("%s: Aborting sleep\n", __func__); 113 105 return -EINVAL;