msm: board-8064: Add support for PM8917 regulator power grid
The regulator power grid changes slightly when using a PM8917 in
place of a PM8921 on 8064 targets. Add configuration data so
that regulators present only on PM8917 are registered when a
PM8917 chip is detected. Also remove PM8921 only regulators when
PM8917 is detected. Modify the USB OTG MVS supply chain to
handle the replacement of an external 5V boost regulator with the
boost present inside of the PM8917.
Increase the max_uV value requested in the wlan_riva driver for
the iris_vdddig supply to 1225000 in order to handle the case of
this supply coming from the S1 regulator in the PM8917
configuration. The S1 regulator only supports 1225000 uV.
Change-Id: Ib5ffa76cbc4590f468003c6863ba73807c4879e7
Signed-off-by: David Collins <collinsd@codeaurora.org>
(cherry picked from commit 793793b277040989d494921ac12cd4bf99939b76)
Signed-off-by: Sudhir Sharma <sudsha@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064.h b/arch/arm/mach-msm/board-8064.h
index 2258b8d..308c1b1 100644
--- a/arch/arm/mach-msm/board-8064.h
+++ b/arch/arm/mach-msm/board-8064.h
@@ -40,6 +40,11 @@
extern int msm8064_pm8921_regulator_pdata_len __devinitdata;
+extern struct pm8xxx_regulator_platform_data
+ msm8064_pm8917_regulator_pdata[] __devinitdata;
+
+extern int msm8064_pm8917_regulator_pdata_len __devinitdata;
+
#define GPIO_VREG_ID_EXT_5V 0
#define GPIO_VREG_ID_EXT_3P3V 1
#define GPIO_VREG_ID_EXT_TS_SW 2
@@ -62,6 +67,9 @@
extern struct rpm_regulator_platform_data
apq8064_rpm_regulator_pdata __devinitdata;
+extern struct rpm_regulator_platform_data
+ apq8064_rpm_regulator_pm8921_pdata __devinitdata;
+
extern struct regulator_init_data msm8064_saw_regulator_pdata_8921_s5;
extern struct regulator_init_data msm8064_saw_regulator_pdata_8921_s6;
extern struct regulator_init_data msm8064_saw_regulator_pdata_8821_s0;
@@ -92,6 +100,7 @@
void apq8064_init_gpu(void);
void apq8064_pm8xxx_gpio_mpp_init(void);
+void __init configure_apq8064_pm8917_power_grid(void);
#define PLATFORM_IS_MPQ8064() \
(machine_is_mpq8064_hrd() || \