msm: board: Use new ext_otg_sw regulator for vbus_power API
The ext_otg_sw regulator will handle enabling and disabling PMIC
8921 GPIO 42. Therefore, modify the vbus_power API in MSM8960 and
MSM8930 board files so that it makes regulator requests and does
not make GPIO requests. Move the "vbus_otg" regulator consumer
name from the 8921_usb_otg regulator to the ext_otg_sw regulator.
Change-Id: I47dabf76911b424b0dc75b7889f98faab27f30bd
Signed-off-by: David Collins <collinsd@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8960-regulator.c b/arch/arm/mach-msm/board-8960-regulator.c
index 2fba02d..5049791 100644
--- a/arch/arm/mach-msm/board-8960-regulator.c
+++ b/arch/arm/mach-msm/board-8960-regulator.c
@@ -212,7 +212,6 @@
};
VREG_CONSUMERS(USB_OTG) = {
REGULATOR_SUPPLY("8921_usb_otg", NULL),
- REGULATOR_SUPPLY("vbus_otg", "msm_otg"),
};
VREG_CONSUMERS(HDMI_MVS) = {
REGULATOR_SUPPLY("8921_hdmi_mvs", NULL),
@@ -236,6 +235,7 @@
};
VREG_CONSUMERS(EXT_OTG_SW) = {
REGULATOR_SUPPLY("ext_otg_sw", NULL),
+ REGULATOR_SUPPLY("vbus_otg", "msm_otg"),
};
#define PM8921_VREG_INIT(_id, _min_uV, _max_uV, _modes, _ops, _apply_uV, \