diff options
| author | Doug Zobel <dzobel1@motorola.com> | 2014-08-22 11:16:23 -0500 |
|---|---|---|
| committer | Douglas Zobel <dzobel1@motorola.com> | 2014-09-04 19:46:54 +0000 |
| commit | 8cf50e31b9d9139eaa6a33ebd53aa64680640784 (patch) | |
| tree | df9d17fa68fed9a20e3be76617c1f8b3a75e6850 | |
| parent | be5b9f82de55be22e4681021c624333047598299 (diff) | |
| download | olio-linux-3.10-8cf50e31b9d9139eaa6a33ebd53aa64680640784.tar.xz olio-linux-3.10-8cf50e31b9d9139eaa6a33ebd53aa64680640784.zip | |
IKXCLOCK-3636 Enable offmode on ES1.2+
Change-Id: Ibcf6c7656992a0809cc6d7e9f197e21128445bab
| -rw-r--r-- | arch/arm/mach-omap2/pm34xx.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index 541694bd074..cc7a5d5275b 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -742,13 +742,14 @@ static void __init pm_errata_configure(void) /* Enable the l2 cache toggling in sleep logic */ enable_omap3630_toggle_l2_on_restore(); - if (omap_rev() < OMAP3630_REV_ES1_2) + if (omap_rev() < OMAP3630_REV_ES1_2) { pm34xx_errata |= PM_PER_MEMORIES_ERRATUM_i582; #ifndef CONFIG_DISABLE_OMAP_ERRATA_i583 pm34xx_errata |= PM_SDRC_WAKEUP_ERRATUM_i583; #endif - if (meminfo.bank[0].size > 256 * (1024 * 1024)) - pm34xx_errata |= PM_SDRC_WAKEUP_ERRATUM_i583; + if (meminfo.bank[0].size > 256 * (1024 * 1024)) + pm34xx_errata |= PM_SDRC_WAKEUP_ERRATUM_i583; + } } else if (cpu_is_omap34xx()) { pm34xx_errata |= PM_PER_MEMORIES_ERRATUM_i582; @@ -851,8 +852,12 @@ int __init omap3_pm_init(void) * XXX Technically this workaround is only needed if off-mode * or OSWR is enabled. */ - if (IS_PM34XX_ERRATUM(PM_PER_MEMORIES_ERRATUM_i582)) - clkdm_add_wkdep(per_clkdm, wkup_clkdm); + + /* + * The PER wake dependency is still needed on ES1.2 which + * has fixed i582 + */ + clkdm_add_wkdep(per_clkdm, wkup_clkdm); clkdm_add_wkdep(neon_clkdm, mpu_clkdm); if (omap_type() != OMAP2_DEVICE_TYPE_GP) { |