dwc3: core: add OTG support

Initialize OTG core if hardware runs in OTG mode.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index badbcc87fa07312047f69e1de8767aada86884e4..5c7a849b2e1c51df707fe74fa86d9f690599461c 100644 (file)
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -680,17 +680,37 @@ static int dwc3_core_init_mode(struct dwc3 *dwc)
                break;
        case USB_DR_MODE_OTG:
                dwc3_set_mode(dwc, DWC3_GCTL_PRTCAP_OTG);
+               ret = dwc3_otg_init(dwc);
+               if (ret) {
+                       dev_err(dev, "failed to initialize otg\n");
+                       return ret;
+               }
+
                ret = dwc3_host_init(dwc);
                if (ret) {
                        dev_err(dev, "failed to initialize host\n");
+                       dwc3_otg_exit(dwc);
                        return ret;
                }
 
                ret = dwc3_gadget_init(dwc);
                if (ret) {
                        dev_err(dev, "failed to initialize gadget\n");
+                       dwc3_host_exit(dwc);
+                       dwc3_otg_exit(dwc);
+                       return ret;
+               }
+
+               /* Now we are ready to start OTG */
+               ret = dwc3_otg_start(dwc);
+               if (ret) {
+                       dev_err(dev, "failed to start otg\n");
+                       dwc3_host_exit(dwc);
+                       dwc3_gadget_exit(dwc);
+                       dwc3_otg_exit(dwc);
                        return ret;
                }
+
                break;
        default:
                dev_err(dev, "Unsupported mode of operation %d\n", dwc->dr_mode);
@@ -710,8 +730,10 @@ static void dwc3_core_exit_mode(struct dwc3 *dwc)
                dwc3_host_exit(dwc);
                break;
        case USB_DR_MODE_OTG:
+               dwc3_otg_stop(dwc);
                dwc3_host_exit(dwc);
                dwc3_gadget_exit(dwc);
+               dwc3_otg_exit(dwc);
                break;
        default:
                /* do nothing */
@@ -935,6 +957,12 @@ static int dwc3_probe(struct platform_device *pdev)
                goto err_usb3phy_power;
        }
 
+       if (dwc->dr_mode == USB_DR_MODE_OTG) {
+               dwc3_core_exit(dwc);
+               dwc->needs_reinit = 1;
+               pm_runtime_put_sync(dev);
+       }
+
        ret = dwc3_core_init_mode(dwc);
        if (ret)
                goto err2;
@@ -1000,6 +1028,9 @@ static int dwc3_suspend(struct device *dev)
        struct dwc3     *dwc = dev_get_drvdata(dev);
        unsigned long   flags;
 
+       if (dwc->dr_mode == USB_DR_MODE_OTG)
+               dwc3_otg_stop(dwc);
+
        spin_lock_irqsave(&dwc->lock, flags);
 
        switch (dwc->dr_mode) {
@@ -1012,7 +1043,10 @@ static int dwc3_suspend(struct device *dev)
 
        dwc3_event_buffers_cleanup(dwc);
 
-       dwc->gctl = dwc3_readl(dwc->regs, DWC3_GCTL);
+       /* backup GCTL only in non-OTG modes */
+       if (dwc->dr_mode != USB_DR_MODE_OTG)
+               dwc->gctl = dwc3_readl(dwc->regs, DWC3_GCTL);
+
        spin_unlock_irqrestore(&dwc->lock, flags);
 
        usb_phy_shutdown(dwc->usb3_phy);
@@ -1042,7 +1076,10 @@ static int dwc3_resume(struct device *dev)
        spin_lock_irqsave(&dwc->lock, flags);
 
        dwc3_event_buffers_setup(dwc);
-       dwc3_writel(dwc->regs, DWC3_GCTL, dwc->gctl);
+
+       /* backup GCTL only in non-OTG modes */
+       if (dwc->dr_mode != USB_DR_MODE_OTG)
+               dwc3_writel(dwc->regs, DWC3_GCTL, dwc->gctl);
 
        switch (dwc->dr_mode) {
        case USB_DR_MODE_PERIPHERAL:
@@ -1058,6 +1095,9 @@ static int dwc3_resume(struct device *dev)
        pm_runtime_set_active(dev);
        pm_runtime_enable(dev);
 
+       if (dwc->dr_mode == USB_DR_MODE_OTG)
+               dwc3_otg_start(dwc);
+
        return 0;
 
 err_usb2phy_init: