dwc3: gadget: register gadget in OTG core
authorRobert Baldyga <r.baldyga@samsung.com>
Mon, 23 Feb 2015 12:57:14 +0000 (13:57 +0100)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 13 Apr 2015 10:44:42 +0000 (12:44 +0200)
Gadget driver needs to be registered in OTG to perform dynamic
role switching.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
drivers/usb/dwc3/gadget.c

index c16ec55..399a33d 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "debug.h"
 #include "core.h"
+#include "otg.h"
 #include "gadget.h"
 #include "io.h"
 
@@ -2774,8 +2775,18 @@ int dwc3_gadget_init(struct dwc3 *dwc)
                goto err4;
        }
 
+       if (dwc->dotg) {
+               ret = otg_set_peripheral(&dwc->dotg->otg, &dwc->gadget);
+               if (ret) {
+                       dev_err(dwc->dev, "failed to set otg peripheral\n");
+                       goto err5;
+               }
+       }
+
        return 0;
 
+err5:
+       usb_del_gadget_udc(&dwc->gadget);
 err4:
        dwc3_gadget_free_endpoints(dwc);
        dma_free_coherent(dwc->dev, DWC3_EP0_BOUNCE_SIZE,
@@ -2800,6 +2811,9 @@ err0:
 
 void dwc3_gadget_exit(struct dwc3 *dwc)
 {
+       if (dwc->dotg)
+               otg_set_peripheral(&dwc->dotg->otg, NULL);
+
        usb_del_gadget_udc(&dwc->gadget);
 
        dwc3_gadget_free_endpoints(dwc);