1 files changed, 34 insertions, 1 deletions

diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c
index fd43fdd6cd81..243512d93e58 100644
--- a/drivers/usb/renesas_usbhs/common.c
+++ b/drivers/usb/renesas_usbhs/common.c
@@ -147,6 +147,33 @@ int usbhs_frame_get_num(struct usbhs_priv *priv)
 }
 
 /*
+ *              bus/vbus functions
+ */
+void usbhs_bus_send_sof_enable(struct usbhs_priv *priv)
+{
+        usbhs_bset(priv, DVSTCTR, (USBRST | UACT), UACT);
+}
+
+void usbhs_bus_send_reset(struct usbhs_priv *priv)
+{
+        usbhs_bset(priv, DVSTCTR, (USBRST | UACT), USBRST);
+}
+
+int usbhs_vbus_ctrl(struct usbhs_priv *priv, int enable)
+{
+        struct platform_device *pdev = usbhs_priv_to_pdev(priv);
+
+        return usbhs_platform_call(priv, set_vbus, pdev, enable);
+}
+
+static void usbhsc_bus_init(struct usbhs_priv *priv)
+{
+        usbhs_write(priv, DVSTCTR, 0);
+
+        usbhs_vbus_ctrl(priv, 0);
+}
+
+/*
  *              local functions
  */
 static void usbhsc_set_buswait(struct usbhs_priv *priv)
@@ -187,7 +214,6 @@ static void usbhsc_power_ctrl(struct usbhs_priv *priv, int enable)
 
                 /* USB on */
                 usbhs_sys_clock_ctrl(priv, enable);
-                usbhsc_set_buswait(priv);
         } else {
                 /* USB off */
                 usbhs_sys_clock_ctrl(priv, enable);
@@ -229,6 +255,10 @@ static void usbhsc_hotplug(struct usbhs_priv *priv)
                 if (usbhsc_flags_has(priv, USBHSF_RUNTIME_PWCTRL))
                         usbhsc_power_ctrl(priv, enable);
 
+                /* bus init */
+                usbhsc_set_buswait(priv);
+                usbhsc_bus_init(priv);
+
                 /* module start */
                 usbhs_mod_call(priv, start, priv);
 
@@ -238,6 +268,9 @@ static void usbhsc_hotplug(struct usbhs_priv *priv)
                 /* module stop */
                 usbhs_mod_call(priv, stop, priv);
 
+                /* bus init */
+                usbhsc_bus_init(priv);
+
                 /* power off */
                 if (usbhsc_flags_has(priv, USBHSF_RUNTIME_PWCTRL))
                         usbhsc_power_ctrl(priv, enable);