aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/plat-nomadik/gpio.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/plat-nomadik/gpio.c b/arch/arm/plat-nomadik/gpio.c
index 5e6653f63286..45b1cf95e378 100644
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
@@ -134,15 +134,12 @@ static void __nmk_gpio_set_mode_safe(struct nmk_gpio_chip *nmk_chip,
134 unsigned offset, int gpio_mode, 134 unsigned offset, int gpio_mode,
135 bool glitch) 135 bool glitch)
136{ 136{
137 u32 rwimsc; 137 u32 rwimsc = readl(nmk_chip->addr + NMK_GPIO_RWIMSC);
138 u32 fwimsc; 138 u32 fwimsc = readl(nmk_chip->addr + NMK_GPIO_FWIMSC);
139 139
140 if (glitch && nmk_chip->set_ioforce) { 140 if (glitch && nmk_chip->set_ioforce) {
141 u32 bit = BIT(offset); 141 u32 bit = BIT(offset);
142 142
143 rwimsc = readl(nmk_chip->addr + NMK_GPIO_RWIMSC);
144 fwimsc = readl(nmk_chip->addr + NMK_GPIO_FWIMSC);
145
146 /* Prevent spurious wakeups */ 143 /* Prevent spurious wakeups */
147 writel(rwimsc & ~bit, nmk_chip->addr + NMK_GPIO_RWIMSC); 144 writel(rwimsc & ~bit, nmk_chip->addr + NMK_GPIO_RWIMSC);
148 writel(fwimsc & ~bit, nmk_chip->addr + NMK_GPIO_FWIMSC); 145 writel(fwimsc & ~bit, nmk_chip->addr + NMK_GPIO_FWIMSC);