Merge tag 'omap-for-v3.9/pm-omap4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into late/omap

From Tony Lindgren:
omap4 pm changes via Paul Walmsley <paul@pwsan.com>:

Some OMAP4 power management fixes and audio device integration
patches.  This pull request contains a fix for an issue discovered during
branch integration.

Basic test logs are available at:

    http://www.pwsan.com/omap/testlogs/omap4_prcm_devel_a_3.9/20130210112717/

* tag 'omap-for-v3.9/pm-omap4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4: hwmod data: Enable AESS hwmod device
  ARM: OMAP4: hwmod data: Update AESS data with memory bank area
  ARM: OMAP4+: AESS: enable internal auto-gating during initial setup
  ASoC: TI AESS: add autogating-enable function, callable from architecture code
  ARM: OMAP2+: hwmod: add enable_preprogram hook
  ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
  ARM: OMAP4: PM: Warn users about usage of older bootloaders

1 files changed, 10 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c
index 9a9be3c9f208..8d5e6e6b14ad 100644
--- a/arch/arm/mach-omap2/pm.c
+++ b/arch/arm/mach-omap2/pm.c
@@ -282,19 +282,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);