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 974fdc56534dd0a3c36fa49bcce92b30547ec831..8e4b1f6f4af61a0a44edea9d59721cfa218c00a2 100644 (file)
--- 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)
 {