Skip to content

Commit

Permalink
ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
Browse files Browse the repository at this point in the history
Commit 1416408 {ARM: OMAP2+: PM: share some suspend-related functions
across OMAP2, 3, 4} moved suspend code to common place but now with
that change, for DT build on OMAP4, suspend hooks are not getting
registered which results in no suspend support.

The DT return condition is limited to PMIC and smartreflex
initialization and hence restrict it so that suspend ops gets
registered.

Cc: Paul Walmsley <paul@pwsan.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
  • Loading branch information
Santosh Shilimkar authored and Paul Walmsley committed Feb 8, 2013
1 parent 6048009 commit cd19010
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions arch/arm/mach-omap2/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit cd19010

Please sign in to comment.