diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
| -rwxr-xr-x | arch/arm/mach-omap2/pm44xx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 7ba1aab..f3a8e93 100755 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -562,7 +562,7 @@ static inline u8 get_achievable_state(u8 available_states, u8 req_min_state, } /** - * omap4_configure_pwdm_suspend() - Program powerdomain on suspend + * omap4_configure_pwrst() - Program powerdomain to their supported state * @is_off_mode: is this an OFF mode transition? * * Program all powerdomain to required power domain state: This logic @@ -571,7 +571,7 @@ static inline u8 get_achievable_state(u8 available_states, u8 req_min_state, * each domain to the state requested. if the requested state is not * available, it will check for the higher state. */ -static void omap4_configure_pwdm_suspend(bool is_off_mode) +static void omap4_configure_pwrst(bool is_off_mode) { struct power_state *pwrst; u32 state; @@ -712,7 +712,7 @@ static int omap4_pm_suspend(void) omap2_pm_wakeup_on_timer(wakeup_timer_seconds, wakeup_timer_milliseconds); - omap4_configure_pwdm_suspend(off_mode_enabled); + omap4_configure_pwrst(off_mode_enabled); /* Enable Device OFF */ if (off_mode_enabled) @@ -867,7 +867,8 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) (!strcmp(pwrdm->name, "cpu1_pwrdm"))) pwrst->next_state = PWRDM_POWER_ON; else - pwrst->next_state = PWRDM_POWER_RET; + omap4_configure_pwrst(off_mode_enabled); + list_add(&pwrst->node, &pwrst_list); return omap_set_pwrdm_state(pwrst->pwrdm, pwrst->next_state); |