Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

usb: ehci-omap: Fix deferred probe for phy handling

PHY model is being used on omap5 platforms even if port mode
is not OMAP_EHCI_PORT_MODE_PHY. So don't guess if PHY is required
or not based on PHY mode.

If PHY is provided in device tree, it must be required. So, if
devm_usb_get_phy_by_phandle() gives us an error code other
than -ENODEV (no PHY) then error out.

This fixes USB Ethernet on omap5-uevm if PHY happens to
probe after EHCI thus causing a -EPROBE_DEFER.

Cc: Johan Hovold <johan@kernel.org>
Cc: Ladislav Michl <ladis@linux-mips.org>
Reported-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Roger Quadros and committed by
Greg Kroah-Hartman
8dc7623b c3788cd9

+5 -4
+5 -4
drivers/usb/host/ehci-omap.c
··· 159 159 /* get the PHY device */ 160 160 phy = devm_usb_get_phy_by_phandle(dev, "phys", i); 161 161 if (IS_ERR(phy)) { 162 - /* Don't bail out if PHY is not absolutely necessary */ 163 - if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY) 164 - continue; 165 - 166 162 ret = PTR_ERR(phy); 163 + if (ret == -ENODEV) { /* no PHY */ 164 + phy = NULL; 165 + continue; 166 + } 167 + 167 168 if (ret != -EPROBE_DEFER) 168 169 dev_err(dev, "Can't get PHY for port %d: %d\n", 169 170 i, ret);