From 4cb7e8cdc534d61c42688b1e88a3c525d4359f47 Mon Sep 17 00:00:00 2001 From: Ambresh K Date: Wed, 26 Oct 2011 21:39:32 -0700 Subject: OMAP4: PM: HSI: Errata: Handling Tesla in transition. Even though current Tesla power state is in RET or OFF, there is a possibility that, PD is transitioning to ON state due to HSI SWAKEUP. Change-Id: I9e2acc2e8d1b18af129d19e0ed3d877a3eb482f3 Signed-off-by: Ambresh K --- arch/arm/mach-omap2/pm44xx.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-omap2/pm44xx.c') diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 333a72a..4d0efab 100644 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -879,9 +879,16 @@ static void omap_pm_clear_dsp_wake_up(void) } ret = pwrdm_read_pwrst(tesla_pwrdm); - /* If Tesla power state in RET or OFF, then not hit by errata */ - if (ret <= PWRDM_POWER_RET) + /* + * If current Tesla power state is in RET/OFF and not in transition, + * then not hit by errata. + */ + if (ret <= PWRDM_POWER_RET) { + if (!(omap4_prminst_read_inst_reg(tesla_pwrdm->prcm_partition, + tesla_pwrdm->prcm_offs, OMAP4_PM_PWSTST) + & OMAP_INTRANSITION_MASK)) return; + } if (clkdm_wakeup(tesla_clkdm)) pr_err("%s: Failed to force wakeup of %s\n", __func__, -- cgit v1.1