USB: ehci-omap: Tweak PHY initialization sequence

For PHY mode, the PHYs must be brought out of reset
before the EHCI controller is started.

This patch fixes the issue where USB devices are not found
on Beagleboard/Beagle-xm if USB has been started previously
by the bootloader. (e.g. by "usb start" command in u-boot)

Tested on Beagleboard, Beagleboard-xm and Pandaboard.

Issue present on 3.10 onwards.

Reported-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Tested-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Cc: stable <stable@vger.kernel.org> # 3.10
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index bafa960ffd92..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]);