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>
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index 0e05407..6a63765 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -2147,12 +2147,21 @@
static struct platform_device apq8064_device_rpm_regulator __devinitdata = {
.name = "rpm-regulator",
- .id = -1,
+ .id = 0,
.dev = {
.platform_data = &apq8064_rpm_regulator_pdata,
},
};
+static struct platform_device
+apq8064_pm8921_device_rpm_regulator __devinitdata = {
+ .name = "rpm-regulator",
+ .id = 1,
+ .dev = {
+ .platform_data = &apq8064_rpm_regulator_pm8921_pdata,
+ },
+};
+
static struct gpio_ir_recv_platform_data gpio_ir_recv_pdata = {
.gpio_nr = 88,
.active_low = 1,
@@ -2171,16 +2180,30 @@
&apq8064_device_qup_i2c_gsbi4,
};
-static struct platform_device *common_devices[] __initdata = {
+static struct platform_device *early_common_devices[] __initdata = {
&apq8064_device_acpuclk,
&apq8064_device_dmov,
&apq8064_device_qup_spi_gsbi5,
+};
+
+static struct platform_device *pm8921_common_devices[] __initdata = {
&apq8064_device_ext_5v_vreg,
&apq8064_device_ext_mpp8_vreg,
&apq8064_device_ext_3p3v_vreg,
&apq8064_device_ssbi_pmic1,
&apq8064_device_ssbi_pmic2,
&apq8064_device_ext_ts_sw_vreg,
+};
+
+static struct platform_device *pm8917_common_devices[] __initdata = {
+ &apq8064_device_ext_mpp8_vreg,
+ &apq8064_device_ext_3p3v_vreg,
+ &apq8064_device_ssbi_pmic1,
+ &apq8064_device_ssbi_pmic2,
+ &apq8064_device_ext_ts_sw_vreg,
+};
+
+static struct platform_device *common_devices[] __initdata = {
&msm_device_smd_apq8064,
&apq8064_device_otg,
&apq8064_device_gadget_peripheral,
@@ -2923,7 +2946,11 @@
BUG_ON(msm_rpm_init(&apq8064_rpm_data));
BUG_ON(msm_rpmrs_levels_init(&msm_rpmrs_data));
regulator_suppress_info_printing();
+ if (socinfo_get_pmic_model() == PMIC_MODEL_PM8917)
+ configure_apq8064_pm8917_power_grid();
platform_device_register(&apq8064_device_rpm_regulator);
+ if (socinfo_get_pmic_model() != PMIC_MODEL_PM8917)
+ platform_device_register(&apq8064_pm8921_device_rpm_regulator);
if (msm_xo_init())
pr_err("Failed to initialize XO votes\n");
msm_clock_init(&apq8064_clock_init_data);
@@ -2943,6 +2970,15 @@
apq8064_device_otg.dev.platform_data = &msm_otg_pdata;
apq8064_ehci_host_init();
apq8064_init_buses();
+
+ platform_add_devices(early_common_devices,
+ ARRAY_SIZE(early_common_devices));
+ if (socinfo_get_pmic_model() != PMIC_MODEL_PM8917)
+ platform_add_devices(pm8921_common_devices,
+ ARRAY_SIZE(pm8921_common_devices));
+ else
+ platform_add_devices(pm8917_common_devices,
+ ARRAY_SIZE(pm8917_common_devices));
platform_add_devices(common_devices, ARRAY_SIZE(common_devices));
if (!(machine_is_mpq8064_cdp() || machine_is_mpq8064_hrd() ||
machine_is_mpq8064_dtv()))