Commit a2f450ca authored by Roger Quadros's avatar Roger Quadros Committed by Greg Kroah-Hartman
Browse files

USB: ehci-omap: Try to get PHY even if not in PHY mode



Even when not in PHY mode, the USB device on the port (e.g. HUB)
might need resources like RESET which can be modelled as a PHY
device. So try to get the PHY device in any case.

Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a1ae0aff
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -202,15 +202,16 @@ static int ehci_hcd_omap_probe(struct platform_device *pdev)
	for (i = 0 ; i < omap->nports ; i++) {
		struct usb_phy *phy;

		if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY)
			continue;

		/* get the PHY device */
		if (dev->of_node)
			phy = devm_usb_get_phy_by_phandle(dev, "phys", i);
		else
			phy = devm_usb_get_phy_dev(dev, i);
		if (IS_ERR(phy) || !phy) {
			/* Don't bail out if PHY is not absolutely necessary */
			if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY)
				continue;

			ret = IS_ERR(phy) ? PTR_ERR(phy) : -ENODEV;
			dev_err(dev, "Can't get PHY device for port %d: %d\n",
					i, ret);