All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ARM: omap4: gpio: fix setting IRQWAKEN bits
@ 2011-06-04 19:03 ` Colin Cross
  0 siblings, 0 replies; 16+ messages in thread
From: Colin Cross @ 2011-06-04 19:03 UTC (permalink / raw)
  To: linux-omap
  Cc: Colin Cross, Tony Lindgren, Russell King, linux-arm-kernel,
	linux-kernel

Setting the IRQWAKEN bit was overwriting previous IRQWAKEN bits,
causing only the last bit set to take effect, resulting in lost
wakeups when the GPIO controller is in idle.

Replace direct writes to IRQWAKEN with writes to SETWKUENA and
CLEARWKUEN.

Signed-off-by: Colin Cross <ccross@android.com>
---
 arch/arm/plat-omap/gpio.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index c985652..23ac7b6 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -539,7 +539,6 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
 {
 	void __iomem *base = bank->base;
 	u32 gpio_bit = 1 << gpio;
-	u32 val;
 
 	if (cpu_is_omap44xx()) {
 		MOD_REG_BIT(OMAP4_GPIO_LEVELDETECT0, gpio_bit,
@@ -563,14 +562,11 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio,
 	if (likely(!(bank->non_wakeup_gpios & gpio_bit))) {
 		if (cpu_is_omap44xx()) {
 			if (trigger != 0)
-				__raw_writel(1 << gpio, bank->base+
-						OMAP4_GPIO_IRQWAKEN0);
-			else {
-				val = __raw_readl(bank->base +
-							OMAP4_GPIO_IRQWAKEN0);
-				__raw_writel(val & (~(1 << gpio)), bank->base +
-							 OMAP4_GPIO_IRQWAKEN0);
-			}
+				__raw_writel(gpio_bit,
+					bank->base + OMAP4_GPIO_SETWKUENA);
+			else
+				__raw_writel(gpio_bit,
+					bank->base + OMAP4_GPIO_CLEARWKUENA);
 		} else {
 			/*
 			 * GPIO wakeup request can only be generated on edge
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2011-06-06 23:26 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-04 19:03 [PATCH] ARM: omap4: gpio: fix setting IRQWAKEN bits Colin Cross
2011-06-04 19:03 ` Colin Cross
2011-06-05  2:37 ` Colin Cross
2011-06-05  2:37   ` Colin Cross
2011-06-05  2:37   ` Colin Cross
2011-06-06 22:32   ` Kevin Hilman
2011-06-06 22:32     ` Kevin Hilman
2011-06-06 23:05     ` Todd Poynor
2011-06-06 23:05       ` Todd Poynor
2011-06-06 23:25       ` Kevin Hilman
2011-06-06 23:25         ` Kevin Hilman
2011-06-06 23:25         ` Kevin Hilman
2011-06-06  7:02 ` Santosh Shilimkar
2011-06-06  7:02   ` Santosh Shilimkar
2011-06-06  7:23   ` DebBarma, Tarun Kanti
2011-06-06  7:23     ` DebBarma, Tarun Kanti

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.