gpio: gpio-omap: limit errata 1.101 handling to wkup domain gpios only

We need to only apply errata 1.101 handling to clear non-wakeup edge gpios
for idle to the gpio bank(s) in the wkup domain to prevent spurious wake-up
events.

And we must restore what we did after idle manually as the gpio bank in
wkup domain is not restored otherwise.

Let's keep bank->saved_datain register reading separate, that's not related
to the 1.101 errata and is used separately on restore.

Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Keerthy <j-keerthy@ti.com>
Cc: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Russell King <rmk+kernel@armlinux.org.uk>
Cc: Tero Kristo <t-kristo@ti.com>
Reported-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 7f33024b6d83e2ccdc6ae583b4c5fc38461a2dea..6375364f66232b07cc96cb0bf36967396719845e 100644 (file)
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1444,7 +1444,10 @@ static void omap_gpio_restore_context(struct gpio_bank *bank);
 static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context)
 {
        struct device *dev = bank->chip.parent;
-       u32 l1 = 0, l2 = 0;
+       void __iomem *base = bank->base;
+       u32 nowake;
+
+       bank->saved_datain = readl_relaxed(base + bank->regs->datain);
 
        if (bank->funcs.idle_enable_level_quirk)
                bank->funcs.idle_enable_level_quirk(bank);
@@ -1456,20 +1459,15 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context)
                goto update_gpio_context_count;
 
        /*
-        * If going to OFF, remove triggering for all
+        * If going to OFF, remove triggering for all wkup domain
         * non-wakeup GPIOs.  Otherwise spurious IRQs will be
         * generated.  See OMAP2420 Errata item 1.101.
         */
-       bank->saved_datain = readl_relaxed(bank->base +
-                                               bank->regs->datain);
-       l1 = bank->context.fallingdetect;
-       l2 = bank->context.risingdetect;
-
-       l1 &= ~bank->enabled_non_wakeup_gpios;
-       l2 &= ~bank->enabled_non_wakeup_gpios;
-
-       writel_relaxed(l1, bank->base + bank->regs->fallingdetect);
-       writel_relaxed(l2, bank->base + bank->regs->risingdetect);
+       if (!bank->loses_context && bank->enabled_non_wakeup_gpios) {
+               nowake = bank->enabled_non_wakeup_gpios;
+               omap_gpio_rmw(base, bank->regs->fallingdetect, nowake, ~nowake);
+               omap_gpio_rmw(base, bank->regs->risingdetect, nowake, ~nowake);
+       }
 
        bank->workaround_enabled = true;
 
@@ -1518,6 +1516,12 @@ static void omap_gpio_unidle(struct gpio_bank *bank)
                                return;
                        }
                }
+       } else {
+               /* Restore changes done for OMAP2420 errata 1.101 */
+               writel_relaxed(bank->context.fallingdetect,
+                              bank->base + bank->regs->fallingdetect);
+               writel_relaxed(bank->context.risingdetect,
+                              bank->base + bank->regs->risingdetect);
        }
 
        if (!bank->workaround_enabled)