msm: board-8930: Add regulator board file for MSM8930+PM8917
Add the board file board-8930-regulator-pm8917.c to capture
regulator configuration and mappings for MSM8930 targets which
utilize a PM8917. Add code into other MSM8930 board files to
conditionally switch to the new regulator configuration values
if PM8917 is detected at runtime.
Change-Id: I68c1025bae45d77d1a04a8935dc7ecb2d857b8ef
Signed-off-by: David Collins <collinsd@codeaurora.org>
(cherry picked from commit 4614cb939178736abca452d468bd291272afbf86)
diff --git a/arch/arm/mach-msm/board-8930.h b/arch/arm/mach-msm/board-8930.h
index 20937e3..7c1ad5b 100644
--- a/arch/arm/mach-msm/board-8930.h
+++ b/arch/arm/mach-msm/board-8930.h
@@ -76,22 +76,31 @@
#define GPIO_VREG_ID_EXT_3P3V 2
#endif
-extern struct regulator_init_data msm8930_saw_regulator_core0_pdata;
-extern struct regulator_init_data msm8930_saw_regulator_core1_pdata;
+extern struct regulator_init_data msm8930_pm8038_saw_regulator_core0_pdata;
+extern struct regulator_init_data msm8930_pm8038_saw_regulator_core1_pdata;
+extern struct regulator_init_data msm8930_pm8917_saw_regulator_core0_pdata;
+extern struct regulator_init_data msm8930_pm8917_saw_regulator_core1_pdata;
extern struct pm8xxx_regulator_platform_data
msm8930_pm8038_regulator_pdata[] __devinitdata;
-
extern int msm8930_pm8038_regulator_pdata_len __devinitdata;
+extern struct pm8xxx_regulator_platform_data
+ msm8930_pm8917_regulator_pdata[] __devinitdata;
+extern int msm8930_pm8917_regulator_pdata_len __devinitdata;
+
#define MSM8930_GPIO_VREG_ID_EXT_5V 0
#define MSM8930_GPIO_VREG_ID_EXT_OTG_SW 1
extern struct gpio_regulator_platform_data
- msm8930_gpio_regulator_pdata[] __devinitdata;
+ msm8930_pm8038_gpio_regulator_pdata[] __devinitdata;
+extern struct gpio_regulator_platform_data
+ msm8930_pm8917_gpio_regulator_pdata[] __devinitdata;
extern struct rpm_regulator_platform_data
- msm8930_rpm_regulator_pdata __devinitdata;
+ msm8930_pm8038_rpm_regulator_pdata __devinitdata;
+extern struct rpm_regulator_platform_data
+ msm8930_pm8917_rpm_regulator_pdata __devinitdata;
#if defined(CONFIG_GPIO_SX150X) || defined(CONFIG_GPIO_SX150X_MODULE)
enum {