usb: chipidea: udc: add new API ci_hdrc_gadget_connect

This API is used enable device function, it is called at below
situations:
- VBUS is connected during boots up
- Hot plug occurs during runtime

Signed-off-by: Peter Chen <peter.chen@nxp.com>
Signed-off-by: Jun Li <jun.li@nxp.com>

diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c
index 0b6166a64d72a762925651ccfd8b296d56cc631a..8c43838623730afee262c6239eae62413074c595 100644 (file)
--- a/drivers/usb/chipidea/udc.c
+++ b/drivers/usb/chipidea/udc.c
@@ -1524,6 +1524,33 @@ static const struct usb_ep_ops usb_ep_ops = {
 /******************************************************************************
  * GADGET block
  *****************************************************************************/
+/**
+ * ci_hdrc_gadget_connect: caller makes sure gadget driver is binded
+ */
+static void ci_hdrc_gadget_connect(struct usb_gadget *_gadget, int is_active)
+{
+       struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
+
+       if (is_active) {
+               pm_runtime_get_sync(&_gadget->dev);
+               hw_device_reset(ci);
+               hw_device_state(ci, ci->ep0out->qh.dma);
+               usb_gadget_set_state(_gadget, USB_STATE_POWERED);
+               usb_udc_vbus_handler(_gadget, true);
+       } else {
+               usb_udc_vbus_handler(_gadget, false);
+               if (ci->driver)
+                       ci->driver->disconnect(&ci->gadget);
+               hw_device_state(ci, 0);
+               if (ci->platdata->notify_event)
+                       ci->platdata->notify_event(ci,
+                       CI_HDRC_CONTROLLER_STOPPED_EVENT);
+               _gadget_stop_activity(&ci->gadget);
+               pm_runtime_put_sync(&_gadget->dev);
+               usb_gadget_set_state(_gadget, USB_STATE_NOTATTACHED);
+       }
+}
+
 static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
 {
        struct ci_hdrc *ci = container_of(_gadget, struct ci_hdrc, gadget);
@@ -1540,26 +1567,8 @@ static int ci_udc_vbus_session(struct usb_gadget *_gadget, int is_active)
                usb_phy_set_charger_state(ci->usb_phy, is_active ?
                        USB_CHARGER_PRESENT : USB_CHARGER_ABSENT);
 
-       if (gadget_ready) {
-               if (is_active) {
-                       pm_runtime_get_sync(&_gadget->dev);
-                       hw_device_reset(ci);
-                       hw_device_state(ci, ci->ep0out->qh.dma);
-                       usb_gadget_set_state(_gadget, USB_STATE_POWERED);
-                       usb_udc_vbus_handler(_gadget, true);
-               } else {
-                       usb_udc_vbus_handler(_gadget, false);
-                       if (ci->driver)
-                               ci->driver->disconnect(&ci->gadget);
-                       hw_device_state(ci, 0);
-                       if (ci->platdata->notify_event)
-                               ci->platdata->notify_event(ci,
-                               CI_HDRC_CONTROLLER_STOPPED_EVENT);
-                       _gadget_stop_activity(&ci->gadget);
-                       pm_runtime_put_sync(&_gadget->dev);
-                       usb_gadget_set_state(_gadget, USB_STATE_NOTATTACHED);
-               }
-       }
+       if (gadget_ready)
+               ci_hdrc_gadget_connect(_gadget, is_active);
 
        return 0;
 }
@@ -1785,18 +1794,10 @@ static int ci_udc_start(struct usb_gadget *gadget,
                return retval;
        }
 
-       pm_runtime_get_sync(&ci->gadget.dev);
-       if (ci->vbus_active) {
-               hw_device_reset(ci);
-       } else {
+       if (ci->vbus_active)
+               ci_hdrc_gadget_connect(gadget, 1);
+       else
                usb_udc_vbus_handler(&ci->gadget, false);
-               pm_runtime_put_sync(&ci->gadget.dev);
-               return retval;
-       }
-
-       retval = hw_device_state(ci, ci->ep0out->qh.dma);
-       if (retval)
-               pm_runtime_put_sync(&ci->gadget.dev);
 
        return retval;
 }