|
@@ -363,7 +363,6 @@ void omap_sram_idle(void)
|
|
printk(KERN_ERR "Invalid mpu state in sram_idle\n");
|
|
printk(KERN_ERR "Invalid mpu state in sram_idle\n");
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- pwrdm_pre_transition();
|
|
|
|
|
|
|
|
/* NEON control */
|
|
/* NEON control */
|
|
if (pwrdm_read_pwrst(neon_pwrdm) == PWRDM_POWER_ON)
|
|
if (pwrdm_read_pwrst(neon_pwrdm) == PWRDM_POWER_ON)
|
|
@@ -386,6 +385,8 @@ void omap_sram_idle(void)
|
|
if (!console_trylock())
|
|
if (!console_trylock())
|
|
goto console_still_active;
|
|
goto console_still_active;
|
|
|
|
|
|
|
|
+ pwrdm_pre_transition();
|
|
|
|
+
|
|
/* PER */
|
|
/* PER */
|
|
if (per_next_state < PWRDM_POWER_ON) {
|
|
if (per_next_state < PWRDM_POWER_ON) {
|
|
per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0;
|
|
per_going_off = (per_next_state == PWRDM_POWER_OFF) ? 1 : 0;
|
|
@@ -455,6 +456,8 @@ void omap_sram_idle(void)
|
|
}
|
|
}
|
|
omap3_intc_resume_idle();
|
|
omap3_intc_resume_idle();
|
|
|
|
|
|
|
|
+ pwrdm_post_transition();
|
|
|
|
+
|
|
/* PER */
|
|
/* PER */
|
|
if (per_next_state < PWRDM_POWER_ON) {
|
|
if (per_next_state < PWRDM_POWER_ON) {
|
|
per_prev_state = pwrdm_read_prev_pwrst(per_pwrdm);
|
|
per_prev_state = pwrdm_read_prev_pwrst(per_pwrdm);
|
|
@@ -478,8 +481,6 @@ console_still_active:
|
|
omap3_disable_io_chain();
|
|
omap3_disable_io_chain();
|
|
}
|
|
}
|
|
|
|
|
|
- pwrdm_post_transition();
|
|
|
|
-
|
|
|
|
clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]);
|
|
clkdm_allow_idle(mpu_pwrdm->pwrdm_clkdms[0]);
|
|
}
|
|
}
|
|
|
|
|