OMAP3: PM: Fix PLL_MOD CLKEN offset in scratchpad

The CM_CLKEN_PLL register saved in scratchpad memory
was wrongly using offset of 0x0004 instead of 0x0000.

The effect of this was that boot ROM code would
restore the wrong value when waking up from off mode.
This wrong value, however, will be overwritten by
prcm context restore. Still, a short period of wrong
clock settings in CM_CLKEN_PLL remained between ROM
code and prcm context restore. This is fixed by the
patch.

Problem reported by: Jouni Hogander <jouni.hogander@nokia.com>

Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@digia.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

diff --git a/arch/arm/mach-omap2/control.c b/arch/arm/mach-omap2/control.c
index b84cff7087b04329bd7d5a33692972cc2cd4d728..c41565ec16e315356f819085a5c53781df63da98 100644 (file)
--- a/arch/arm/mach-omap2/control.c
+++ b/arch/arm/mach-omap2/control.c
@@ -230,7 +230,7 @@ void omap3_save_scratchpad_contents(void)
        prcm_block_contents.cm_clksel_wkup =
                        cm_read_mod_reg(WKUP_MOD, CM_CLKSEL);
        prcm_block_contents.cm_clken_pll =
-                       cm_read_mod_reg(PLL_MOD, OMAP3430_CM_CLKEN_PLL);
+                       cm_read_mod_reg(PLL_MOD, CM_CLKEN);
        prcm_block_contents.cm_autoidle_pll =
                        cm_read_mod_reg(PLL_MOD, OMAP3430_CM_AUTOIDLE_PLL);
        prcm_block_contents.cm_clksel1_pll =