Re: [PATCH 12/19] omap: Fix gpio_resume_after_retention

[Tony Lindgren <tony@atomide.com>]

[-- Attachment #1: Type: text/plain, Size: 681 bytes --]

* Aguirre, Sergio <saaguirre@ti.com> [100311 15:47]:
> Hi Tony,
> 
> > -----Original Message-----
> > From: Tony Lindgren [mailto:tony@atomide.com]
> > Sent: Thursday, March 11, 2010 5:49 PM
> > To: linux-arm-kernel@lists.infradead.org
> > Cc: Aguirre, Sergio; linux-omap@vger.kernel.org
> > Subject: [PATCH 12/19] omap: Fix gpio_resume_after_retention
> > 
> > From: Tony Lindgren <Aguirre>
> 
> Something funky mix happened with the authorship here :)
> 
> Should be:
> 
> From: Sergio Aguirre <saaguirre@ti.com>

Thanks, updated patch below.

I think this issue is related to applying patches from
patchwork.kernel.org with email addresses in Lastname, Firstname
format..

Tony

[-- Attachment #2: gpio-fix.patch --]
[-- Type: text/x-diff, Size: 1599 bytes --]

>From f00d649703fbedbdeb33d63c4c4731656e11297c Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Wed, 3 Mar 2010 16:21:08 +0000
Subject: [PATCH] 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 <tony@atomide.com>
  Date:   Mon Feb 15 09:27:25 2010 -0800

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

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 337199e..76a347b 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -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);
 			}