---

yaml --- r: 296147 b: refs/heads/master c: 506d81e h: refs/heads/master i: 296145: ca52a28 296143: b90b0a3 v: v3
git-mirror · Feb 16, 2012 · a833876 · a833876
1 parent 5e4e9bd
commit a833876
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5dc06b7ea31a41707ab67e3caad5127bd45069b6
+refs/heads/master: 506d81ef31ece39c760e8c2b2071e6aa3b983b72
diff --git a/trunk/arch/arm/mach-omap2/pm.c b/trunk/arch/arm/mach-omap2/pm.c
@@ -227,6 +227,14 @@ postcore_initcall(omap2_common_pm_init);
 
 static int __init omap2_common_pm_late_init(void)
 {
+	/*
+	 * In the case of DT, the PMIC and SR initialization will be done using
+	 * a completely different mechanism.
+	 * Disable this part if a DT blob is available.
+	 */
+	if (of_have_populated_dt())
+		return 0;
+
 	/* Init the voltage layer */
 	omap_pmic_late_init();
 	omap_voltage_late_init();