summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTarun Kanti DebBarma <tarun.kanti@ti.com>2013-04-04 15:16:13 -0500
committerLinus Walleij <linus.walleij@linaro.org>2013-04-10 23:41:16 +0200
commit60b18b9aa4daa616a8b360feb35d1bfe4d606019 (patch)
tree9950c203be6a1a78f027f77129b3a38d8a710dfb /drivers
parent879fe32438be9ff1ea2cf44e39e11b58206a76b2 (diff)
downloadop-kernel-dev-60b18b9aa4daa616a8b360feb35d1bfe4d606019.zip
op-kernel-dev-60b18b9aa4daa616a8b360feb35d1bfe4d606019.tar.gz
gpio/omap: remove extra context restores in *_runtime_resume()
68942edb09f69b6e09522d1d346665eb3aadde49 (gpio/omap: fix wakeups on level-triggered GPIOs) already restores the fallingdetect and risingdetect contexts in *_runtime_resume(). These registers were modified in *_runtime_suspend() to include even those configured as level-triggered since only edge-triggered gpios can generate wakeup events. Therefore, the old context restores of the same registers present later in the code is not needed any more. Remove them. Signed-off-by: Tarun Kanti DebBarma <tarun.kanti@ti.com> Signed-off-by: Jon Hunter <jon-hunter@ti.com> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com> Reviewed-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/gpio-omap.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 0de2e0d..405ce6f 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1292,10 +1292,6 @@ static int omap_gpio_runtime_resume(struct device *dev)
return 0;
}
- __raw_writel(bank->context.fallingdetect,
- bank->base + bank->regs->fallingdetect);
- __raw_writel(bank->context.risingdetect,
- bank->base + bank->regs->risingdetect);
l = __raw_readl(bank->base + bank->regs->datain);
/*
OpenPOWER on IntegriCloud