summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/gpio.c
diff options
context:
space:
mode:
authorKevin Hilman <khilman@deeprootsystems.com>2010-06-09 12:53:07 +0200
committerTony Lindgren <tony@atomide.com>2010-06-10 14:37:41 +0200
commitf7ec0b0b16c97a75a1b6aa8bc8b32548003f3339 (patch)
tree406da69edcd8a997632255765edecae59da106a6 /arch/arm/plat-omap/gpio.c
parentomap: DMTIMER: Ack pending interrupt always when stopping a timer (diff)
downloadlinux-f7ec0b0b16c97a75a1b6aa8bc8b32548003f3339.tar.xz
linux-f7ec0b0b16c97a75a1b6aa8bc8b32548003f3339.zip
omap: GPIO: fix auto-disable of debounce clock
The addition of the new debounce code (commit 168ef3d9a56bd8bffe0ef4189c450888b4aefefe) broke the auto-disable of debounce clocks on idle by forgetting to update the debounce clock enable mask. Add back the updating of bank->dbck_enable_mask so debounce clocks are auto-disabled. Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
-rw-r--r--arch/arm/plat-omap/gpio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 393e9219a5b6..9b7e3545f325 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -673,6 +673,7 @@ static void _set_gpio_debounce(struct gpio_bank *bank, unsigned gpio,
if (cpu_is_omap34xx() || cpu_is_omap44xx())
clk_disable(bank->dbck);
}
+ bank->dbck_enable_mask = val;
__raw_writel(val, reg);
}