| Message ID | 1248190107-21703-1-git-send-email-ext-roger.quadros@nokia.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Kevin Hilman |
| Headers | show |
Roger Quadros <ext-roger.quadros@nokia.com> writes: > Defer calling omap3_save_scratchpad_contents() to after > omap3_secure_ram_storage has been initialized. This fixes > lockup & reboot while entering CORE OFF mode on HS/EMU devices. > > Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com> Thanks, pushed to PM branch, and pm-2.6.29. Kevin -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index e80d59f..14f10bc 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -1101,7 +1101,6 @@ static int __init omap3_pm_init(void) pm_idle = omap3_pm_idle; - omap3_save_scratchpad_contents(); omap3_idle_init(); pwrdm_add_wkdep(neon_pwrdm, mpu_pwrdm); @@ -1131,6 +1130,7 @@ static int __init omap3_pm_init(void) local_fiq_enable(); } + omap3_save_scratchpad_contents(); err1: return ret; err2:
Defer calling omap3_save_scratchpad_contents() to after omap3_secure_ram_storage has been initialized. This fixes lockup & reboot while entering CORE OFF mode on HS/EMU devices. Signed-off-by: Roger Quadros <ext-roger.quadros@nokia.com> --- arch/arm/mach-omap2/pm34xx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)