aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/cpuidle34xx.c4
-rw-r--r--arch/arm/mach-omap2/pm34xx.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/cpuidle34xx.c b/arch/arm/mach-omap2/cpuidle34xx.c
index 5128b8c26b09..1d10c4aa9352 100644
--- a/arch/arm/mach-omap2/cpuidle34xx.c
+++ b/arch/arm/mach-omap2/cpuidle34xx.c
@@ -110,8 +110,8 @@ static int omap3_enter_idle(struct cpuidle_device *dev,
110 core_state = PWRDM_POWER_RET; 110 core_state = PWRDM_POWER_RET;
111 } 111 }
112 112
113 set_pwrdm_state(mpu_pd, mpu_state); 113 pwrdm_set_next_pwrst(mpu_pd, mpu_state);
114 set_pwrdm_state(core_pd, core_state); 114 pwrdm_set_next_pwrst(core_pd, core_state);
115 115
116 if (omap_irq_pending()) 116 if (omap_irq_pending())
117 goto return_sleep_time; 117 goto return_sleep_time;
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c
index 501b00100d59..c77f6db8a63d 100644
--- a/arch/arm/mach-omap2/pm34xx.c
+++ b/arch/arm/mach-omap2/pm34xx.c
@@ -359,7 +359,7 @@ void omap_sram_idle(void)
359 359
360 /* NEON control */ 360 /* NEON control */
361 if (pwrdm_read_pwrst(neon_pwrdm) == PWRDM_POWER_ON) 361 if (pwrdm_read_pwrst(neon_pwrdm) == PWRDM_POWER_ON)
362 set_pwrdm_state(neon_pwrdm, mpu_next_state); 362 pwrdm_set_next_pwrst(neon_pwrdm, mpu_next_state);
363 363
364 /* PER */ 364 /* PER */
365 per_next_state = pwrdm_read_next_pwrst(per_pwrdm); 365 per_next_state = pwrdm_read_next_pwrst(per_pwrdm);