diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-01-31 13:20:26 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-01-31 13:20:26 -0800 |
| commit | 112258b1d215a16d575dc6ace344a0bb7196c19c (patch) | |
| tree | d96e08ee64f1c98da9da6156ef12954869846db4 /arch/arm/mach-omap2/pm34xx.c | |
| parent | 0e6d8cad448bde3d846961bb43db15daae94562e (diff) | |
| parent | 8353584eae4af8f37e5a23b63ed816c79185a9c9 (diff) | |
| download | op-kernel-dev-112258b1d215a16d575dc6ace344a0bb7196c19c.zip op-kernel-dev-112258b1d215a16d575dc6ace344a0bb7196c19c.tar.gz | |
Merge branch 'for_2.6.38/pm-fixes' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-fixes
Diffstat (limited to 'arch/arm/mach-omap2/pm34xx.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index a4aa192..2f864e4 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -168,9 +168,10 @@ static void omap3_core_restore_context(void) * once during boot sequence, but this works as we are not using secure * services. */ -static void omap3_save_secure_ram_context(u32 target_mpu_state) +static void omap3_save_secure_ram_context(void) { u32 ret; + int mpu_next_state = pwrdm_read_next_pwrst(mpu_pwrdm); if (omap_type() != OMAP2_DEVICE_TYPE_GP) { /* @@ -181,7 +182,7 @@ static void omap3_save_secure_ram_context(u32 target_mpu_state) pwrdm_set_next_pwrst(mpu_pwrdm, PWRDM_POWER_ON); ret = _omap_save_secure_sram((u32 *) __pa(omap3_secure_ram_storage)); - pwrdm_set_next_pwrst(mpu_pwrdm, target_mpu_state); + pwrdm_set_next_pwrst(mpu_pwrdm, mpu_next_state); /* Following is for error tracking, it should not happen */ if (ret) { printk(KERN_ERR "save_secure_sram() returns %08x\n", @@ -1094,7 +1095,7 @@ static int __init omap3_pm_init(void) local_fiq_disable(); omap_dma_global_context_save(); - omap3_save_secure_ram_context(PWRDM_POWER_ON); + omap3_save_secure_ram_context(); omap_dma_global_context_restore(); local_irq_enable(); |
