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

Commit 12f27826 authored by Santosh Shilimkar's avatar Santosh Shilimkar Committed by Kevin Hilman
Browse files

ARM: OMAP4: PM: Keep static dep between MPUSS-EMIF and MPUSS-L3/L4 and DUCATI-L3 



As per OMAP4430 TRM, the dynamic dependency between MPUSS -> EMIF
and MPUSS -> L4PER/L3_* and DUCATI -> L3_* clockdomains is enable
by default. Refer register CM_MPU_DYNAMICDEP description for details.

But these dynamic dependencies doesn't work as expected. The hardware
recommendation is to enable static dependencies for above clockdomains.
Without this, system locks up or randomly crashes.

Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Acked-by: default avatarJean Pihet <j-pihet@ti.com>
Reviewed-by: default avatarKevin Hilman <khilman@ti.com>
Tested-by: default avatarVishwanath BS <vishwanath.bs@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 501f0c75

arch/arm/mach-omap2/pm44xx.c

+30 −0
Original line number Diff line number Diff line
@@ -99,6 +99,8 @@ static int __init pwrdms_setup(struct powerdomain *pwrdm, void *unused) 
static int __init omap4_pm_init(void)

{

	int ret;

	struct clockdomain *emif_clkdm, *mpuss_clkdm, *l3_1_clkdm;

	struct clockdomain *ducati_clkdm, *l3_2_clkdm, *l4_per_clkdm;



	if (!cpu_is_omap44xx())

		return -ENODEV;
@@ -111,6 +113,34 @@ static int __init omap4_pm_init(void) 
		goto err2;

	}



	/*

	 * The dynamic dependency between MPUSS -> MEMIF and

	 * MPUSS -> L4_PER/L3_* and DUCATI -> L3_* doesn't work as

	 * expected. The hardware recommendation is to enable static

	 * dependencies for these to avoid system lock ups or random crashes.

	 */

	mpuss_clkdm = clkdm_lookup("mpuss_clkdm");

	emif_clkdm = clkdm_lookup("l3_emif_clkdm");

	l3_1_clkdm = clkdm_lookup("l3_1_clkdm");

	l3_2_clkdm = clkdm_lookup("l3_2_clkdm");

	l4_per_clkdm = clkdm_lookup("l4_per_clkdm");

	ducati_clkdm = clkdm_lookup("ducati_clkdm");

	if ((!mpuss_clkdm) || (!emif_clkdm) || (!l3_1_clkdm) ||

		(!l3_2_clkdm) || (!ducati_clkdm) || (!l4_per_clkdm))

		goto err2;



	ret = clkdm_add_wkdep(mpuss_clkdm, emif_clkdm);

	ret |= clkdm_add_wkdep(mpuss_clkdm, l3_1_clkdm);

	ret |= clkdm_add_wkdep(mpuss_clkdm, l3_2_clkdm);

	ret |= clkdm_add_wkdep(mpuss_clkdm, l4_per_clkdm);

	ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm);

	ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);

	if (ret) {

		pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 "

				"wakeup dependency\n");

		goto err2;

	}



#ifdef CONFIG_SUSPEND

	suspend_set_ops(&omap_pm_ops);

#endif /* CONFIG_SUSPEND */