1 files changed, 25 insertions, 6 deletions

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 3a4004a620ad..999909451e37 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -420,18 +420,27 @@ static int dwc3_probe(struct platform_device *pdev)
                 return -ENOMEM;
         }
 
-        dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+        if (node) {
+                dwc->usb2_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 0);
+                dwc->usb3_phy = devm_usb_get_phy_by_phandle(dev, "usb-phy", 1);
+        } else {
+                dwc->usb2_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+                dwc->usb3_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB3);
+        }
+
         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;
         }
 
+        usb_phy_set_suspend(dwc->usb2_phy, 0);
+        usb_phy_set_suspend(dwc->usb3_phy, 0);
+
         spin_lock_init(&dwc->lock);
         platform_set_drvdata(pdev, dwc);
 
@@ -450,8 +459,7 @@ static int dwc3_probe(struct platform_device *pdev)
         else
                 dwc->maximum_speed = DWC3_DCFG_SUPERSPEED;
 
-        if (of_get_property(node, "tx-fifo-resize", NULL))
-                dwc->needs_fifo_resize = true;
+        dwc->needs_fifo_resize = of_property_read_bool(node, "tx-fifo-resize");
 
         pm_runtime_enable(dev);
         pm_runtime_get_sync(dev);
@@ -550,9 +558,9 @@ err0:
 static int dwc3_remove(struct platform_device *pdev)
 {
         struct dwc3     *dwc = platform_get_drvdata(pdev);
-        struct resource *res;
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        usb_phy_set_suspend(dwc->usb2_phy, 1);
+        usb_phy_set_suspend(dwc->usb3_phy, 1);
 
         pm_runtime_put(&pdev->dev);
         pm_runtime_disable(&pdev->dev);
@@ -580,11 +588,22 @@ static int dwc3_remove(struct platform_device *pdev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id of_dwc3_match[] = {
+        {
+                .compatible = "synopsys,dwc3"
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(of, of_dwc3_match);
+#endif
+
 static struct platform_driver dwc3_driver = {
         .probe          = dwc3_probe,
         .remove         = dwc3_remove,
         .driver         = {
                 .name   = "dwc3",
+                .of_match_table = of_match_ptr(of_dwc3_match),
         },
 };