USB: msm_otg: Rename MHL USB high speed switch regulator name
USB DP and DM lines are routed to USB PHY via MHL transmitter chip
if it is present on the board. MHL transmitter route USB DP and DM
lines to MSM based on the High Speed Switch position. The regulator
controlling this switch is different across targets. For example
this switch is powered up by 3.3V regulator on 8960 Liquid and it is
5V regulator on 8930 fluid. Hence rename existing "mhl_ext_3p3v"
supply name to a generic name "mhl_usb_hs_switch".
Change-Id: I35a6240fdbb01fa6b695a52968cd141d9418def7
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
diff --git a/drivers/usb/otg/msm_otg.c b/drivers/usb/otg/msm_otg.c
index 5b85d98..14118e7 100644
--- a/drivers/usb/otg/msm_otg.c
+++ b/drivers/usb/otg/msm_otg.c
@@ -74,7 +74,7 @@
static struct regulator *hsusb_1p8;
static struct regulator *hsusb_vddcx;
static struct regulator *vbus_otg;
-static struct regulator *mhl_analog_switch;
+static struct regulator *mhl_usb_hs_switch;
static struct power_supply *psy;
static bool aca_id_turned_on;
@@ -250,16 +250,16 @@
if (!pdata->mhl_enable)
return;
- if (!mhl_analog_switch) {
- pr_err("%s: mhl_analog_switch is NULL.\n", __func__);
+ if (!mhl_usb_hs_switch) {
+ pr_err("%s: mhl_usb_hs_switch is NULL.\n", __func__);
return;
}
if (on) {
- if (regulator_enable(mhl_analog_switch))
- pr_err("unable to enable mhl_analog_switch\n");
+ if (regulator_enable(mhl_usb_hs_switch))
+ pr_err("unable to enable mhl_usb_hs_switch\n");
} else {
- regulator_disable(mhl_analog_switch);
+ regulator_disable(mhl_usb_hs_switch);
}
}
@@ -3355,10 +3355,10 @@
}
if (pdata->mhl_enable) {
- mhl_analog_switch = devm_regulator_get(motg->phy.dev,
- "mhl_ext_3p3v");
- if (IS_ERR(mhl_analog_switch)) {
- dev_err(&pdev->dev, "Unable to get mhl_analog_switch\n");
+ mhl_usb_hs_switch = devm_regulator_get(motg->phy.dev,
+ "mhl_usb_hs_switch");
+ if (IS_ERR(mhl_usb_hs_switch)) {
+ dev_err(&pdev->dev, "Unable to get mhl_usb_hs_switch\n");
goto free_ldo_init;
}
}