lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OMAP4: PM: Do not assume clkdm supports hw transitions

Browse Source 
omap_set_pwrdm_state today assumes a clkdm supports hw_auto
transitions and hence leaves some which do not support this
in sw wkup state preventing low power transitions.

Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Benoit Cousson <b-cousson@ti.com>
Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
This commit is contained in:
Rajendra Nayak
2010-12-21 22:37:28 -07:00
committed by Paul Walmsley
parent 71a488dbcc
commit 33de32b3eb
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-omap2/pm.c
View File

@@ -95,8 +95,7 @@ static void omap2_init_processor_devices(void)
/* /*
* This sets pwrdm state (other than mpu & core. Currently only ON & * This sets pwrdm state (other than mpu & core. Currently only ON &
* RET are supported. Function is assuming that clkdm doesn't have * RET are supported.
* hw_sup mode enabled.
*/ */
int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
{ {
@@ -137,7 +136,10 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state)
switch (sleep_switch) { switch (sleep_switch) {
case FORCEWAKEUP_SWITCH: case FORCEWAKEUP_SWITCH:
omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]); if (pwrdm->pwrdm_clkdms[0]->flags & CLKDM_CAN_ENABLE_AUTO)
omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);
else
omap2_clkdm_sleep(pwrdm->pwrdm_clkdms[0]);
break; break;
case LOWPOWERSTATE_SWITCH: case LOWPOWERSTATE_SWITCH:
pwrdm_set_lowpwrstchange(pwrdm); pwrdm_set_lowpwrstchange(pwrdm);