1 files changed, 49 insertions, 29 deletions

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index e475fcda1d68..6b4c2f2eb946 100644
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -27,6 +27,7 @@
 #include "udc.h"
 #include "bits.h"
 #include "debug.h"
+#include "otg.h"
 
 /* control endpoint description */
 static const struct usb_endpoint_descriptor
@@ -84,8 +85,10 @@ static int hw_device_state(struct ci_hdrc *ci, u32 dma)
                 /* interrupt, error, port change, reset, sleep/suspend */
                 hw_write(ci, OP_USBINTR, ~0,
                              USBi_UI|USBi_UEI|USBi_PCI|USBi_URI|USBi_SLI);
+                hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);
         } else {
                 hw_write(ci, OP_USBINTR, ~0, 0);
+                hw_write(ci, OP_USBCMD, USBCMD_RS, 0);
         }
         return 0;
 }
@@ -1445,9 +1448,6 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
         unsigned long flags;
         int gadget_ready = 0;
 
-        if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS))
-                return -EOPNOTSUPP;
-
         spin_lock_irqsave(&ci->lock, flags);
         ci->vbus_active = is_active;
         if (ci->driver)
@@ -1459,6 +1459,7 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
                         pm_runtime_get_sync(&_gadget->dev);
                         hw_device_reset(ci, USBMODE_CM_DC);
                         hw_device_state(ci, ci->ep0out->qh.dma);
+                        dev_dbg(ci->dev, "Connected to host\n");
                 } else {
                         hw_device_state(ci, 0);
                         if (ci->platdata->notify_event)
@@ -1466,6 +1467,7 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
                                 CI_HDRC_CONTROLLER_STOPPED_EVENT);
                         _gadget_stop_activity(&ci->gadget);
                         pm_runtime_put_sync(&_gadget->dev);
+                        dev_dbg(ci->dev, "Disconnected from host\n");
                 }
         }
 
@@ -1509,6 +1511,9 @@ static int ci_udc_pullup(struct usb_gadget *_gadget, int is_on)
 {
         struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
 
+        if (!ci->vbus_active)
+                return -EOPNOTSUPP;
+
         if (is_on)
                 hw_write(ci, OP_USBCMD, USBCMD_RS, USBCMD_RS);
         else
@@ -1630,14 +1635,11 @@ static int ci_udc_start(struct usb_gadget *gadget,
 
         ci->driver = driver;
         pm_runtime_get_sync(&ci->gadget.dev);
-        if (ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) {
-                if (ci->vbus_active) {
-                        if (ci->platdata->flags & CI_HDRC_REGS_SHARED)
-                                hw_device_reset(ci, USBMODE_CM_DC);
-                } else {
-                        pm_runtime_put_sync(&ci->gadget.dev);
-                        goto done;
-                }
+        if (ci->vbus_active) {
+                hw_device_reset(ci, USBMODE_CM_DC);
+        } else {
+                pm_runtime_put_sync(&ci->gadget.dev);
+                goto done;
         }
 
         retval = hw_device_state(ci, ci->ep0out->qh.dma);
@@ -1660,8 +1662,7 @@ static int ci_udc_stop(struct usb_gadget *gadget,
 
         spin_lock_irqsave(&ci->lock, flags);
 
-        if (!(ci->platdata->flags & CI_HDRC_PULLUP_ON_VBUS) ||
-                        ci->vbus_active) {
+        if (ci->vbus_active) {
                 hw_device_state(ci, 0);
                 if (ci->platdata->notify_event)
                         ci->platdata->notify_event(ci,
@@ -1796,16 +1797,15 @@ static int udc_start(struct ci_hdrc *ci)
                 }
         }
 
-        if (!(ci->platdata->flags & CI_HDRC_REGS_SHARED)) {
-                retval = hw_device_reset(ci, USBMODE_CM_DC);
-                if (retval)
-                        goto put_transceiver;
-        }
-
         if (ci->transceiver) {
                 retval = otg_set_peripheral(ci->transceiver->otg,
                                                 &ci->gadget);
-                if (retval)
+                /*
+                 * If we implement all USB functions using chipidea drivers,
+                 * it doesn't need to call above API, meanwhile, if we only
+                 * use gadget function, calling above API is useless.
+                 */
+                if (retval && retval != -ENOTSUPP)
                         goto put_transceiver;
         }
 
@@ -1816,6 +1816,9 @@ static int udc_start(struct ci_hdrc *ci)
         pm_runtime_no_callbacks(&ci->gadget.dev);
         pm_runtime_enable(&ci->gadget.dev);
 
+        /* Update ci->vbus_active */
+        ci_handle_vbus_change(ci);
+
         return retval;
 
 remove_trans:
@@ -1839,13 +1842,13 @@ free_qh_pool:
 }
 
 /**
- * udc_remove: parent remove must call this to remove UDC
+ * ci_hdrc_gadget_destroy: parent remove must call this to remove UDC
  *
  * No interrupts active, the IRQ has been released
  */
-static void udc_stop(struct ci_hdrc *ci)
+void ci_hdrc_gadget_destroy(struct ci_hdrc *ci)
 {
-        if (ci == NULL)
+        if (!ci->roles[CI_ROLE_GADGET])
                 return;
 
         usb_del_gadget_udc(&ci->gadget);
@@ -1860,15 +1863,32 @@ static void udc_stop(struct ci_hdrc *ci)
                 if (ci->global_phy)
                         usb_put_phy(ci->transceiver);
         }
-        /* my kobject is dynamic, I swear! */
-        memset(&ci->gadget, 0, sizeof(ci->gadget));
+}
+
+static int udc_id_switch_for_device(struct ci_hdrc *ci)
+{
+        if (ci->is_otg) {
+                ci_clear_otg_interrupt(ci, OTGSC_BSVIS);
+                ci_enable_otg_interrupt(ci, OTGSC_BSVIE);
+        }
+
+        return 0;
+}
+
+static void udc_id_switch_for_host(struct ci_hdrc *ci)
+{
+        if (ci->is_otg) {
+                /* host doesn't care B_SESSION_VALID event */
+                ci_clear_otg_interrupt(ci, OTGSC_BSVIS);
+                ci_disable_otg_interrupt(ci, OTGSC_BSVIE);
+        }
 }
 
 /**
  * ci_hdrc_gadget_init - initialize device related bits
  * ci: the controller
  *
- * This function enables the gadget role, if the device is "device capable".
+ * This function initializes the gadget, if the device is "device capable".
  */
 int ci_hdrc_gadget_init(struct ci_hdrc *ci)
 {
@@ -1881,11 +1901,11 @@ int ci_hdrc_gadget_init(struct ci_hdrc *ci)
         if (!rdrv)
                 return -ENOMEM;
 
-        rdrv->start     = udc_start;
-        rdrv->stop      = udc_stop;
+        rdrv->start     = udc_id_switch_for_device;
+        rdrv->stop      = udc_id_switch_for_host;
         rdrv->irq       = udc_irq;
         rdrv->name      = "gadget";
         ci->roles[CI_ROLE_GADGET] = rdrv;
 
-        return 0;
+        return udc_start(ci);
 }