1 files changed, 10 insertions, 3 deletions

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 16d7150e8557..9bd7dfe3315b 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -187,6 +187,12 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
                 }
 
                 omap->phy[i] = phy;
+
+                if (pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_PHY) {
+                        usb_phy_init(omap->phy[i]);
+                        /* bring PHY out of suspend */
+                        usb_phy_set_suspend(omap->phy[i], 0);
+                }
         }
 
         pm_runtime_enable(dev);
@@ -211,13 +217,14 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
         }
 
         /*
-         * Bring PHYs out of reset.
+         * Bring PHYs out of reset for non PHY modes.
          * Even though HSIC mode is a PHY-less mode, the reset
          * line exists between the chips and can be modelled
          * as a PHY device for reset control.
          */
         for (i = 0; i < omap->nports; i++) {
-                if (!omap->phy[i])
+                if (!omap->phy[i] ||
+                     pdata->port_mode[i] == OMAP_EHCI_PORT_MODE_PHY)
                         continue;
 
                 usb_phy_init(omap->phy[i]);
@@ -294,7 +301,7 @@ static struct platform_driver ehci_hcd_omap_driver = {
         /*.resume               = ehci_hcd_omap_resume, */
         .driver = {
                 .name           = hcd_name,
-                .of_match_table = of_match_ptr(omap_ehci_dt_ids),
+                .of_match_table = omap_ehci_dt_ids,
         }
 };