diff options
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -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();  |