1 files changed, 15 insertions, 0 deletions

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index c34452a7304f..79a24fab13d1 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -50,6 +50,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
 
+#include <linux/usb/otg.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 
@@ -136,6 +137,8 @@ static void dwc3_core_soft_reset(struct dwc3 *dwc)
         reg |= DWC3_GUSB2PHYCFG_PHYSOFTRST;
         dwc3_writel(dwc->regs, DWC3_GUSB2PHYCFG(0), reg);
 
+        usb_phy_init(dwc->usb2_phy);
+        usb_phy_init(dwc->usb3_phy);
         mdelay(100);
 
         /* Clear USB3 PHY reset */
@@ -465,6 +468,18 @@ static int __devinit dwc3_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
+        dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+        if (IS_ERR_OR_NULL(dwc->usb2_phy)) {
+                dev_err(dev, "no usb2 phy configured\n");
+                return -EPROBE_DEFER;
+        }
+
+        dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
+        if (IS_ERR_OR_NULL(dwc->usb3_phy)) {
+                dev_err(dev, "no usb3 phy configured\n");
+                return -EPROBE_DEFER;
+        }
+
         spin_lock_init(&dwc->lock);
         platform_set_drvdata(pdev, dwc);