diff options
| author | Paul Walmsley <paul@pwsan.com> | 2013-02-10 11:27:02 -0700 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2013-02-10 11:27:02 -0700 |
| commit | a5a8c31d9f7587b601ecf0106c8abeabe3da24c3 (patch) | |
| tree | 9de75a8020d78fc210f82451414bc0a09f6fa228 /arch/arm/mach-omap2/pm.c | |
| parent | 5cebb23c6cbcfcae1d0586d07898677716f133bc (diff) | |
| parent | cd19010c03cc9cce2366d5065720a3ab546833dd (diff) | |
Merge branches 'sg_aess_reset_devel_3.9' and 'omap4_pm_fixes_a_3.9' into omap4_prcm_devel_a_3.9
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index f4b3143a8b1d..1ec429964b7f 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -345,19 +345,19 @@ int __init omap2_common_pm_late_init(void) * a completely different mechanism. * Disable this part if a DT blob is available. */ - if (of_have_populated_dt()) - return 0; + if (!of_have_populated_dt()) { - /* Init the voltage layer */ - omap_pmic_late_init(); - omap_voltage_late_init(); + /* Init the voltage layer */ + omap_pmic_late_init(); + omap_voltage_late_init(); - /* Initialize the voltages */ - omap3_init_voltages(); - omap4_init_voltages(); + /* Initialize the voltages */ + omap3_init_voltages(); + omap4_init_voltages(); - /* Smartreflex device init */ - omap_devinit_smartreflex(); + /* Smartreflex device init */ + omap_devinit_smartreflex(); + } #ifdef CONFIG_SUSPEND suspend_set_ops(&omap_pm_ops); |