On Thu, 13 Dec 2018, Roger Quadros wrote:

> 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: Alan Stern <st...@rowland.harvard.edu>
> Cc: Johan Hovold <jo...@kernel.org>
> Cc: Ladislav Michl <la...@linux-mips.org>
> Cc: Peter Ujfalusi <peter.ujfal...@ti.com>
> Cc: Tony Lindgren <t...@atomide.com>
> Reported-by: Peter Ujfalusi <peter.ujfal...@ti.com>
> Signed-off-by: Roger Quadros <rog...@ti.com>
> ---
>  drivers/usb/host/ehci-omap.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> index 7e4c1334..0eacbf4 100644
> --- a/drivers/usb/host/ehci-omap.c
> +++ b/drivers/usb/host/ehci-omap.c
> @@ -159,9 +159,11 @@ static int ehci_hcd_omap_probe(struct platform_device 
> *pdev)
>               /* get the PHY device */
>               phy = devm_usb_get_phy_by_phandle(dev, "phys", i);
>               if (IS_ERR(phy)) {
> -                     /* Don't bail out if PHY is not absolutely necessary */
> -                     if (pdata->port_mode[i] != OMAP_EHCI_PORT_MODE_PHY)
> +                     ret = PTR_ERR(phy);
> +                     if (ret == -ENODEV) { /* no PHY */
> +                             phy = NULL;
>                               continue;
> +                     }
>  
>                       ret = PTR_ERR(phy);

Please remove this line.

Alan Stern

>                       if (ret != -EPROBE_DEFER)
> 

Reply via email to