From ab6513c7521c44cde1af333bf8d0f2e4ea2e489a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Tue, 6 Dec 2011 18:28:07 -0800 Subject: ARM: omap4: gpio: Fix wakeup for masked level triggered interrupts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When converting level triggered interrupts to edge triggered for low power modes, only unmasked interrupts were set up. Change-Id: Ib8acfa47e9dfe992422a40bab423f0de64293476 Signed-off-by: Arve Hjønnevåg --- drivers/gpio/gpio-omap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers') diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index d11900a..197e4db 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c @@ -1484,10 +1484,10 @@ static int omap2_gpio_set_edge_wakeup(struct gpio_bank *bank, bool suspend) * even if they are set for level detection only. */ __raw_writel(bank->context.edge_falling | - (bank->context.ew_leveldetect0 & wkup_status), + (bank->type_leveldetect0 & wkup_status), (bank->base + bank->regs->fallingdetect)); __raw_writel(bank->context.edge_rising | - (bank->context.ew_leveldetect1 & wkup_status), + (bank->type_leveldetect1 & wkup_status), (bank->base + bank->regs->risingdetect)); __raw_writel(0, bank->base + bank->regs->leveldetect0); __raw_writel(0, bank->base + bank->regs->leveldetect1); -- cgit v1.1