diff options
| author | Kevin Hilman <khilman@ti.com> | 2011-11-23 14:43:01 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-11-23 14:43:01 -0800 |
| commit | 46232a3622c6e33605906ee6690dfef372925f53 (patch) | |
| tree | cdfa7d32a8ebf7f380aaff0ccc45d472d4da6536 /arch/arm/mach-omap2/pm.c | |
| parent | cc1b0765da6078b906772b79ff211b88cc0ae958 (diff) | |
| download | lwn-46232a3622c6e33605906ee6690dfef372925f53.tar.gz lwn-46232a3622c6e33605906ee6690dfef372925f53.zip | |
ARM: OMAP: PM: only register TWL with voltage layer when device is present
Current code registers voltage layer details for TWL PMIC even when a TWL
has not been registered. Fix this to only register the TWL with voltage
layer when the TWL PMIC is initialized by board-level code.
Signed-off-by: Kevin Hilman <khilman@ti.com>
Cc: stable@vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/pm.c')
| -rw-r--r-- | arch/arm/mach-omap2/pm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/pm.c b/arch/arm/mach-omap2/pm.c index 1e79bdf313e3..00bff46ca48b 100644 --- a/arch/arm/mach-omap2/pm.c +++ b/arch/arm/mach-omap2/pm.c @@ -24,6 +24,7 @@ #include "powerdomain.h" #include "clockdomain.h" #include "pm.h" +#include "twl-common.h" static struct omap_device_pm_latency *pm_lats; @@ -226,11 +227,8 @@ postcore_initcall(omap2_common_pm_init); static int __init omap2_common_pm_late_init(void) { - /* Init the OMAP TWL parameters */ - omap3_twl_init(); - omap4_twl_init(); - /* Init the voltage layer */ + omap_pmic_late_init(); omap_voltage_late_init(); /* Initialize the voltages */ |