From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 12/19] omap: Fix gpio_resume_after_retention
Date: Thu, 11 Mar 2010 15:48:34 -0800 [thread overview]
Message-ID: <20100311234834.4500.12726.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100311234404.4500.82861.stgit@baageli.muru.com>
From: Tony Lindgren <Aguirre>
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>
---
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 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);
}
next prev parent reply other threads:[~2010-03-11 23:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 23:48 [PATCH 00/19] omap-fixes for 2.6.34-rc1 Tony Lindgren
2010-03-11 23:48 ` [PATCH 01/19] omap3: Fix compile for Touch Book early_param Tony Lindgren
2010-03-11 23:48 ` [PATCH 02/19] omap2/3/4: ehci: avoid compiler error with touchbook Tony Lindgren
2010-03-11 23:48 ` [PATCH 03/19] omap4: Fix build break by moving omap_smc1 into a separate .S Tony Lindgren
2010-03-11 23:48 ` [PATCH 04/19] omap2: add USB initialization for tusb6010 Tony Lindgren
2010-03-11 23:48 ` [PATCH 05/19] omap2: Update n8x0 defconfig to test multi-omap and DMA api changes Tony Lindgren
2010-03-11 23:48 ` [PATCH 06/19] omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors Tony Lindgren
2010-03-11 23:48 ` [PATCH 07/19] OMAP2: serial.c: Fix number of uarts in early_init Tony Lindgren
2010-03-11 23:48 ` [PATCH 08/19] omap2/3/4: mailbox: remove compiler warning Tony Lindgren
2010-03-11 23:48 ` [PATCH 09/19] omap: pass the reboot command to the boot loader Tony Lindgren
2010-03-11 23:48 ` [PATCH 10/19] omap: Checkpatch cleanup for blizzard.h Tony Lindgren
2010-03-11 23:48 ` [PATCH 11/19] omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board Tony Lindgren
2010-03-11 23:48 ` Tony Lindgren [this message]
2010-03-11 23:50 ` [PATCH 12/19] omap: Fix gpio_resume_after_retention Aguirre, Sergio
2010-03-11 23:56 ` Tony Lindgren
2010-03-12 0:04 ` Aguirre, Sergio
2010-03-12 10:37 ` Gadiyar, Anand
2010-03-12 13:19 ` Felipe Balbi
2010-03-12 14:00 ` Aguirre, Sergio
2010-03-11 23:48 ` [PATCH 13/19] omap: mach-omap2/io.c: fix function declarations Tony Lindgren
2010-03-11 23:48 ` [PATCH 14/19] omap3: pandora: add missing i2c3 board_info Tony Lindgren
2010-03-11 23:48 ` [PATCH 15/19] OMAP2: cpu_is_omap2*: fix compile-time removal of unused code Tony Lindgren
2010-03-11 23:48 ` [PATCH 16/19] OMAP4: fix temporary hacks that break multi-omap PM Tony Lindgren
2010-03-11 23:48 ` [PATCH 17/19] omap: Add DSI regulator supply to OMAP3EVM board file Tony Lindgren
2010-03-12 4:48 ` Hiremath, Vaibhav
2010-03-12 17:12 ` Tony Lindgren
2010-03-12 17:18 ` Tony Lindgren
2010-03-11 23:59 ` [PATCH 18/19] " Tony Lindgren
2010-03-12 0:06 ` Tony Lindgren
2010-03-12 0:00 ` [PATCH 19/19] omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values Tony Lindgren
2010-03-12 0:10 ` Tony Lindgren
2010-03-12 0:11 ` [PATCH 19b/19] ARM/OMAP: Remove the +x bit from a couple of source files Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100311234834.4500.12726.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).