From a83387600b72d9c219f712bd881fe7dc89066f60 Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti.com>
Date: Thu, 8 Dec 2011 16:47:39 +0100
Subject: [PATCH] --- yaml --- r: 296147 b: refs/heads/master c:
 506d81ef31ece39c760e8c2b2071e6aa3b983b72 h: refs/heads/master i:   296145:
 ca52a288aa0de55ae157cd918ed5eec37ec66ea1   296143:
 b90b0a3f7cefcfb1489fcf9d506249b378ad3f95 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/arm/mach-omap2/pm.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 507f0b0e62e6..4e435e530933 100644
--- 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
index 1881fe915149..ad4f69394166 100644
--- 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();