Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b86cfb52 authored by Rajendra Nayak's avatar Rajendra Nayak Committed by Paul Walmsley
Browse files

OMAP2+: PM: idle clkdms only if already in idle 



The omap_set_pwrdm_state function forces clockdomains
to idle, without checking the existing idle state
programmed, instead based solely on the HW capability
of the clockdomain to support idle.
This is wrong and the clockdomains should be idled
post a state_switch *only* if idle transitions on the
clockdomain were already enabled.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Acked-by: default avatarKevin Hilman <khilman@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 32a363c0

arch/arm/mach-omap2/pm.c

+3 −1
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) 
	u32 cur_state;

	int sleep_switch = -1;

	int ret = 0;

	int hwsup = 0;



	if (pwrdm == NULL || IS_ERR(pwrdm))

		return -EINVAL;
@@ -127,6 +128,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) 
			(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) {

			sleep_switch = LOWPOWERSTATE_SWITCH;

		} else {

			hwsup = clkdm_in_hwsup(pwrdm->pwrdm_clkdms[0]);

			clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);

			pwrdm_wait_transition(pwrdm);

			sleep_switch = FORCEWAKEUP_SWITCH;
@@ -142,7 +144,7 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) 


	switch (sleep_switch) {

	case FORCEWAKEUP_SWITCH:

		if (pwrdm->pwrdm_clkdms[0]->flags & CLKDM_CAN_ENABLE_AUTO)

		if (hwsup)

			clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);

		else

			clkdm_sleep(pwrdm->pwrdm_clkdms[0]);