diff options
| author | Benoit Cousson <b-cousson@ti.com> | 2011-12-08 16:47:39 +0100 |
|---|---|---|
| committer | Benoit Cousson <b-cousson@ti.com> | 2012-02-16 23:06:58 +0100 |
| commit | 506d81ef31ece39c760e8c2b2071e6aa3b983b72 (patch) | |
| tree | 6d3574de11e01c7a760d4be70606bbb13e3c6b67 /arch | |
| parent | 5dc06b7ea31a41707ab67e3caad5127bd45069b6 (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')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 1881fe91514..ad4f6939416 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); 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(); |