From: Kevin Hilman <khilman@mvista.com>
Date: Tue, 24 Jul 2007 22:36:51 +0000 (-0700)
Subject: ARM: OMAP: full-retention fix for 2430
X-Git-Tag: v2.6.23-omap1~241
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?p=linux-2.6-omap-h63xx.git;a=commitdiff_plain;h=1d562c9e425d59b7c0dc45162b660b325c2d7b99

ARM: OMAP: full-retention fix for 2430

This fixes a bug where the 2430 crashes upon entering full-retention
due to a register difference between 2420 and 2430.

Signed-off-by: Kevin Hilman <khilman@mvista.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 974fdc56534..8e4b1f6f4af 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -346,7 +346,7 @@ static struct subsys_attribute sleep_while_idle_attr = {
 
 static struct clk *osc_ck, *emul_ck;
 
-#define CONTROL_DEVCONF		__REG32(0x48000274)
+#define CONTROL_DEVCONF		__REG32(OMAP2_CTRL_BASE + 0x274)
 
 static int omap2_fclks_active(void)
 {