aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm44xx.c
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-10-20 13:26:58 -0700
committerColin Cross <ccross@android.com>2011-10-20 13:29:41 -0700
commit4a67500effe7715ff7bccb963b9b16da536fd723 (patch)
treeb216d2d6d323170b41d12ef63a51dea9c468cb1e /arch/arm/mach-omap2/pm44xx.c
parent2c579ee43ece3329ab92a186c460d439db5609c9 (diff)
downloadkernel_samsung_tuna-4a67500effe7715ff7bccb963b9b16da536fd723.zip
kernel_samsung_tuna-4a67500effe7715ff7bccb963b9b16da536fd723.tar.gz
kernel_samsung_tuna-4a67500effe7715ff7bccb963b9b16da536fd723.tar.bz2
ARM: omap4: pm: add static dependency between mpuss and l3_1 for 4460
Some 4460 devices are unstable when the static dependency between mpuss and l3_1 is removed. Change-Id: I678dae1e87cb89f7fe363d4fcb22e12c78aebe2e Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
-rw-r--r--arch/arm/mach-omap2/pm44xx.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c
index 8bbf3ab..e0522c0 100644
--- a/arch/arm/mach-omap2/pm44xx.c
+++ b/arch/arm/mach-omap2/pm44xx.c
@@ -1144,13 +1144,17 @@ static int __init omap4_pm_init(void)
/*ret |= clkdm_add_wkdep(mpuss_clkdm, emif_clkdm);*/
ret |= clkdm_add_wkdep(mpuss_clkdm, l4_per);
ret |= clkdm_add_wkdep(mpuss_clkdm, l4_cfg);
+
+ /* There appears to be a problem between the MPUSS and L3_1 */
+ ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm);
+
if (ret) {
pr_err("Failed to add MPUSS -> "
- "L4* wakeup dependency\n");
+ "L4* and L3_1 wakeup dependency\n");
goto err2;
}
pr_info("OMAP4 PM: Static dependency added between"
- " MPUSS <-> L4_PER/CFG.\n");
+ " MPUSS <-> L4_PER/CFG and L3_1.\n");
}
(void) clkdm_for_each(clkdms_setup, NULL);