aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/pm.c
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2011-12-08 10:47:39 -0500
committerBenoit Cousson <b-cousson@ti.com>2012-02-16 17:06:58 -0500
commit506d81ef31ece39c760e8c2b2071e6aa3b983b72 (patch)
tree6d3574de11e01c7a760d4be70606bbb13e3c6b67 /arch/arm/mach-omap2/pm.c
parent5dc06b7ea31a41707ab67e3caad5127bd45069b6 (diff)
ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT
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. Signed-off-by: Benoit Cousson <b-cousson@ti.com> Acked-by: Kevin Hilman <khilman@ti.com> Acked-by: Rob Herring <rob.herring@calxeda.com> Acked-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
-rw-r--r--arch/arm/mach-omap2/pm.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 1881fe915149..ad4f69394166 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -227,6 +227,14 @@ postcore_initcall(omap2_common_pm_init);
227 227
228static int __init omap2_common_pm_late_init(void) 228static int __init omap2_common_pm_late_init(void)
229{ 229{
230 /*
231 * In the case of DT, the PMIC and SR initialization will be done using
232 * a completely different mechanism.
233 * Disable this part if a DT blob is available.
234 */
235 if (of_have_populated_dt())
236 return 0;
237
230 /* Init the voltage layer */ 238 /* Init the voltage layer */
231 omap_pmic_late_init(); 239 omap_pmic_late_init();
232 omap_voltage_late_init(); 240 omap_voltage_late_init();