Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f00d6497 authored by Sergio Aguirre's avatar Sergio Aguirre Committed by Tony Lindgren
Browse files

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 3f1686a9
  Author: Tony Lindgren <tony@atomide.com>
  Date:   Mon Feb 15 09:27:25 2010 -0800

      omap: Fix gpio.c for multi-omap for omap4

Signed-off-by: default avatarSergio Aguirre <saaguirre@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 228893f9

arch/arm/plat-omap/gpio.c

+5 −5
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ 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 +