omap: Fix gpio_resume_after_retention
Subsystems (2)
PATCH 1/1 omap: Fix gpio_resume_after_retention
For omap4 case, this was wrongly writing GPIO_LEVELDETECTx registers with OMAP24XX_ offset and OMAP4_ offset.
Bug introduced in commit:
commit 3f1686a9bfe74979c6ad538c78039730f665f77e
Author: Tony Lindgren <[email protected]>
Date: Mon Feb 15 09:27:25 2010 -0800
omap: Fix gpio.c for multi-omap for omap4
Signed-off-by Sergio Aguirre <[email protected]>
Signed-off-by Tony Lindgren <[email protected]>
arch/arm/plat-omap/gpio.c +5 -5
@@ -2140,18 +2140,18 @@ void omap2_gpio_resume_after_retention(void)if (gen) {u32 old0, old1; -if (cpu_is_omap24xx () ||cpu_is_omap44xx ()) { +if (cpu_is_omap24xx () ||cpu_is_omap34xx ()) { old0 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); old1 =__raw_readl (bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); -__raw_writel (old0 | gen, bank->base + +__raw_writel (old0 | gen, bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); -__raw_writel (old1 | gen, bank->base + +__raw_writel (old1 | gen, bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); -__raw_writel (old0, bank->base + +__raw_writel (old0, bank->base +OMAP24XX_GPIO_LEVELDETECT0 ); -__raw_writel (old1, bank->base + +__raw_writel (old1, bank->base +OMAP24XX_GPIO_LEVELDETECT1 ); }
--xkXJwpr35CY/Lc3I--