ENGR00307558-2 usb: chipidea: host: vbus control change for OTG

Leave vbus on/off hanlded by OTG fsm if in OTG mode.

Signed-off-by: Li Jun <b47624@freescale.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c
index ce3dc7345616..35506d9d62bd 100644
--- a/drivers/usb/chipidea/host.c
+++ b/drivers/usb/chipidea/host.c
@@ -264,7 +264,11 @@ static int host_start(struct ci_hdrc *ci)
         ehci->has_hostpc = ci->hw_bank.lpm;
         ehci->imx28_write_fix = ci->imx28_write_fix;
 
-        if (ci->platdata->reg_vbus) {
+        /*
+         * vbus is always on if host is not in OTG FSM mode,
+         * otherwise should be controlled by OTG FSM
+         */
+        if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci)) {
                 ret = regulator_enable(ci->platdata->reg_vbus);
                 if (ret) {
                         dev_err(ci->dev,
@@ -291,7 +295,7 @@ static int host_start(struct ci_hdrc *ci)
         return ret;
 
 disable_reg:
-        if (ci->platdata->reg_vbus)
+        if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci))
                 regulator_disable(ci->platdata->reg_vbus);
 
 put_hcd:
@@ -307,7 +311,7 @@ static void host_stop(struct ci_hdrc *ci)
         if (hcd) {
                 usb_remove_hcd(hcd);
                 usb_put_hcd(hcd);
-                if (ci->platdata->reg_vbus)
+                if (ci->platdata->reg_vbus && !ci_otg_is_fsm_mode(ci))
                         regulator_disable(ci->platdata->reg_vbus);
         }
 }