diff options
| author | Sergio Aguirre <saaguirre@ti.com> | 2010-03-03 11:21:08 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-03-11 17:50:01 -0500 |
| commit | f00d649703fbedbdeb33d63c4c4731656e11297c (patch) | |
| tree | 234391e54dcdc11e5bbe00d7c399f690967e499b /arch/arm | |
| parent | 228893f9d2b70a7416267050ce03bfd9eb624713 (diff) | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 337199ed3479..76a347b3ce07 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) | |||
| 2140 | if (gen) { | 2140 | if (gen) { |
| 2141 | u32 old0, old1; | 2141 | u32 old0, old1; |
| 2142 | 2142 | ||
| 2143 | if (cpu_is_omap24xx() || cpu_is_omap44xx()) { | 2143 | if (cpu_is_omap24xx() || cpu_is_omap34xx()) { |
| 2144 | old0 = __raw_readl(bank->base + | 2144 | old0 = __raw_readl(bank->base + |
| 2145 | OMAP24XX_GPIO_LEVELDETECT0); | 2145 | OMAP24XX_GPIO_LEVELDETECT0); |
| 2146 | old1 = __raw_readl(bank->base + | 2146 | old1 = __raw_readl(bank->base + |
| 2147 | OMAP24XX_GPIO_LEVELDETECT1); | 2147 | OMAP24XX_GPIO_LEVELDETECT1); |
| 2148 | __raw_writel(old0 | gen, bank->base + | 2148 | __raw_writel(old0 | gen, bank->base + |
| 2149 | OMAP24XX_GPIO_LEVELDETECT0); | 2149 | OMAP24XX_GPIO_LEVELDETECT0); |
| 2150 | __raw_writel(old1 | gen, bank->base + | 2150 | __raw_writel(old1 | gen, bank->base + |
| 2151 | OMAP24XX_GPIO_LEVELDETECT1); | 2151 | OMAP24XX_GPIO_LEVELDETECT1); |
| 2152 | __raw_writel(old0, bank->base + | 2152 | __raw_writel(old0, bank->base + |
| 2153 | OMAP24XX_GPIO_LEVELDETECT0); | 2153 | OMAP24XX_GPIO_LEVELDETECT0); |
| 2154 | __raw_writel(old1, bank->base + | 2154 | __raw_writel(old1, bank->base + |
| 2155 | OMAP24XX_GPIO_LEVELDETECT1); | 2155 | OMAP24XX_GPIO_LEVELDETECT1); |
| 2156 | } | 2156 | } |
| 2157 | 2157 | ||