aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpio
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2011-12-06 18:28:07 -0800
committerArve Hjønnevåg <arve@android.com>2011-12-06 18:28:07 -0800
commitab6513c7521c44cde1af333bf8d0f2e4ea2e489a (patch)
tree9f276aa1a2d54c285c37c7b12cdd262fd0b26caf /drivers/gpio
parent72f0ac587209962b48ef6591449d29d5c6092aa0 (diff)
downloadkernel_samsung_tuna-ab6513c7521c44cde1af333bf8d0f2e4ea2e489a.zip
kernel_samsung_tuna-ab6513c7521c44cde1af333bf8d0f2e4ea2e489a.tar.gz
kernel_samsung_tuna-ab6513c7521c44cde1af333bf8d0f2e4ea2e489a.tar.bz2
ARM: omap4: gpio: Fix wakeup for masked level triggered interrupts
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 <arve@android.com>
Diffstat (limited to 'drivers/gpio')
-rw-r--r--drivers/gpio/gpio-omap.c4
1 files changed, 2 insertions, 2 deletions
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);