]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
usb: hcd: Initialize USB phy if needed
authorValentine Barshak <valentine.barshak@cogentembedded.com>
Tue, 3 Dec 2013 21:42:22 +0000 (01:42 +0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Dec 2013 02:00:51 +0000 (18:00 -0800)
This adds external USB phy support to USB HCD driver that
allows to find and initialize external USB phy, bound to
the HCD, when the HCD is added.
The usb_add_hcd function returns -EPROBE_DEFER if the USB
phy, bound to the HCD, is not ready.
If no USB phy is bound, the HCD is initialized as usual.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hcd.c

index 7527c8e4ec64e22c34b303f3877f09d3fb281d40..d3a9bcde53c39e4604f9b9eab3e05d17e51c0d25 100644 (file)
@@ -2589,6 +2589,24 @@ int usb_add_hcd(struct usb_hcd *hcd,
        int retval;
        struct usb_device *rhdev;
 
+       if (IS_ENABLED(CONFIG_USB_PHY) && !hcd->phy) {
+               struct usb_phy *phy = usb_get_phy_dev(hcd->self.controller, 0);
+
+               if (IS_ERR(phy)) {
+                       retval = PTR_ERR(phy);
+                       if (retval == -EPROBE_DEFER)
+                               return retval;
+               } else {
+                       retval = usb_phy_init(phy);
+                       if (retval) {
+                               usb_put_phy(phy);
+                               return retval;
+                       }
+                       hcd->phy = phy;
+                       hcd->remove_phy = 1;
+               }
+       }
+
        dev_info(hcd->self.controller, "%s\n", hcd->product_desc);
 
        /* Keep old behaviour if authorized_default is not in [0, 1]. */