Commit 086542a2 authored by Tony Lindgren's avatar Tony Lindgren Committed by Greg Kroah-Hartman

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

[ Upstream commit 21e2118f ]

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: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0bbdfcb1
...@@ -1453,7 +1453,10 @@ static void omap_gpio_restore_context(struct gpio_bank *bank); ...@@ -1453,7 +1453,10 @@ static void omap_gpio_restore_context(struct gpio_bank *bank);
static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context) static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context)
{ {
struct device *dev = bank->chip.parent; 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) if (bank->funcs.idle_enable_level_quirk)
bank->funcs.idle_enable_level_quirk(bank); bank->funcs.idle_enable_level_quirk(bank);
...@@ -1465,20 +1468,15 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context) ...@@ -1465,20 +1468,15 @@ static void omap_gpio_idle(struct gpio_bank *bank, bool may_lose_context)
goto update_gpio_context_count; 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 * non-wakeup GPIOs. Otherwise spurious IRQs will be
* generated. See OMAP2420 Errata item 1.101. * generated. See OMAP2420 Errata item 1.101.
*/ */
bank->saved_datain = readl_relaxed(bank->base + if (!bank->loses_context && bank->enabled_non_wakeup_gpios) {
bank->regs->datain); nowake = bank->enabled_non_wakeup_gpios;
l1 = bank->context.fallingdetect; omap_gpio_rmw(base, bank->regs->fallingdetect, nowake, ~nowake);
l2 = bank->context.risingdetect; omap_gpio_rmw(base, bank->regs->risingdetect, nowake, ~nowake);
}
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);
bank->workaround_enabled = true; bank->workaround_enabled = true;
...@@ -1527,6 +1525,12 @@ static void omap_gpio_unidle(struct gpio_bank *bank) ...@@ -1527,6 +1525,12 @@ static void omap_gpio_unidle(struct gpio_bank *bank)
return; 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) if (!bank->workaround_enabled)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment