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

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

OMAP4: PM: Use the low-power state change feature on OMAP4 



For pwrdm's which support LOWPOWERSTATECHANGE, do not try waking
up the domain to put it back to deeper sleep state.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarBenoit Cousson <b-cousson@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: default avatarKevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 6081dc34

arch/arm/mach-omap2/pm.c

+22 −6
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ static void omap2_init_processor_devices(void) 
	}

}



/* Types of sleep_switch used in omap_set_pwrdm_state */

#define FORCEWAKEUP_SWITCH	0

#define LOWPOWERSTATE_SWITCH	1



/*

 * This sets pwrdm state (other than mpu & core. Currently only ON &

 * RET are supported. Function is assuming that clkdm doesn't have
@@ -114,9 +118,14 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) 
		return ret;



	if (pwrdm_read_pwrst(pwrdm) < PWRDM_POWER_ON) {

		if ((pwrdm_read_pwrst(pwrdm) > state) &&

			(pwrdm->flags & PWRDM_HAS_LOWPOWERSTATECHANGE)) {

			sleep_switch = LOWPOWERSTATE_SWITCH;

		} else {

			omap2_clkdm_wakeup(pwrdm->pwrdm_clkdms[0]);

		sleep_switch = 1;

			pwrdm_wait_transition(pwrdm);

			sleep_switch = FORCEWAKEUP_SWITCH;

		}

	}



	ret = pwrdm_set_next_pwrst(pwrdm, state);
@@ -126,12 +135,19 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state) 
		goto err;

	}



	if (sleep_switch) {

	switch (sleep_switch) {

	case FORCEWAKEUP_SWITCH:

		omap2_clkdm_allow_idle(pwrdm->pwrdm_clkdms[0]);

		pwrdm_wait_transition(pwrdm);

		pwrdm_state_switch(pwrdm);

		break;

	case LOWPOWERSTATE_SWITCH:

		pwrdm_set_lowpwrstchange(pwrdm);

		break;

	default:

		return ret;

	}



	pwrdm_wait_transition(pwrdm);

	pwrdm_state_switch(pwrdm);

err:

	return ret;

}