As per the comment in omap2_common_late_init() looks like the original intent of the DT check was to treat only the PMIC and SR initialization differently. Recent changes to consolidate the suspend-resume code across OMAP3/4 resulted into the registration of suspend ops also being dependent on the check for DT blob. Since the suspend-resume operation should not really be dependent on the usage of DT, move the suspend ops registration before the check for DT.
Signed-off-by: Vaibhav Bedia <[email protected]> --- arch/arm/mach-omap2/pm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 9cb5ced..21761c0 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -297,6 +297,10 @@ postcore_initcall(omap2_common_pm_init); int __init omap2_common_pm_late_init(void) { +#ifdef CONFIG_SUSPEND + suspend_set_ops(&omap_pm_ops); +#endif + /* * In the case of DT, the PMIC and SR initialization will be done using * a completely different mechanism. @@ -316,9 +320,5 @@ int __init omap2_common_pm_late_init(void) /* Smartreflex device init */ omap_devinit_smartreflex(); -#ifdef CONFIG_SUSPEND - suspend_set_ops(&omap_pm_ops); -#endif - return 0; } -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
