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
--- arch/arm/plat-omap/gpio.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
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 ); }
Signature · 1 line
1.6.3.3
PATCH 1/1 omap: Fix gpio_resume_after_retention
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: omap-fixes
Initial commit ID (Likely to change): 3be3c2a3edc0d0171fbe5cf5a5267d3a9c58a0ca
PatchWorks
http://patchwork.kernel.org/patch/83370/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=3be3c2a3edc0d0171fbe5cf5a5267d3a9c58a0ca