Revert "gpio: omap: Fix lost edge wake-up interrupts"

This reverts commit a522f1d0c381c42f3ace13b8bbeeccabdd6d2e5c.

With cpu_pm handling fixed for omaps, and with gpio-omap now returning
notify error on pending interrupts, we can drop the old workaround for
seeing if there may be pending edge interrupts.

Depends-on: ARM: OMAP2+: Handle errors for cpu_pm
Depends-on: gpio: omap: Block idle on pending gpio interrupts
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Ladislav Michl <ladis@linux-mips.org>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20200304225433.37336-4-tony@atomide.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 3d50cb25aa24d79ccc4c0aa04e98625e9f92968d..b8e2ecc3eadeba73cf038754d723d5bec7941deb 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1102,23 +1102,13 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context)
 {
        struct device *dev = bank->chip.parent;
        void __iomem *base = bank->base;
-       u32 mask, nowake;
+       u32 nowake;
 
        bank->saved_datain = readl_relaxed(base + bank->regs->datain);
 
        if (!bank->enabled_non_wakeup_gpios)
                goto update_gpio_context_count;
 
-       /* Check for pending EDGE_FALLING, ignore EDGE_BOTH */
-       mask = bank->enabled_non_wakeup_gpios & bank->context.fallingdetect;
-       mask &= ~bank->context.risingdetect;
-       bank->saved_datain |= mask;
-
-       /* Check for pending EDGE_RISING, ignore EDGE_BOTH */
-       mask = bank->enabled_non_wakeup_gpios & bank->context.risingdetect;
-       mask &= ~bank->context.fallingdetect;
-       bank->saved_datain &= ~mask;
-
        if (!may_lose_context)
                goto update_gpio_context_count;