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/twl-common.h | |
parent | cc1b0765da6078b906772b79ff211b88cc0ae958 (diff) | |
download | op-kernel-dev-46232a3622c6e33605906ee6690dfef372925f53.zip op-kernel-dev-46232a3622c6e33605906ee6690dfef372925f53.tar.gz |
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/twl-common.h')
-rw-r--r-- | arch/arm/mach-omap2/twl-common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/twl-common.h b/arch/arm/mach-omap2/twl-common.h index 5e83a5b..275dde8 100644 --- a/arch/arm/mach-omap2/twl-common.h +++ b/arch/arm/mach-omap2/twl-common.h @@ -1,6 +1,8 @@ #ifndef __OMAP_PMIC_COMMON__ #define __OMAP_PMIC_COMMON__ +#include <plat/irqs.h> + #define TWL_COMMON_PDATA_USB (1 << 0) #define TWL_COMMON_PDATA_BCI (1 << 1) #define TWL_COMMON_PDATA_MADC (1 << 2) @@ -30,6 +32,7 @@ struct twl4030_platform_data; void omap_pmic_init(int bus, u32 clkrate, const char *pmic_type, int pmic_irq, struct twl4030_platform_data *pmic_data); +void omap_pmic_late_init(void); static inline void omap2_pmic_init(const char *pmic_type, struct twl4030_platform_data *pmic_data) |