dm: usb: Copy over usb_device values from usb_scan_device() to final usb_device

[platform/kernel/u-boot.git] / drivers / usb / host / usb-uclass.c

diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index ba7d32a..c5ece58 100644 (file)
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -533,11 +533,7 @@ int usb_scan_device(struct udevice *parent, int port,
        plat = dev_get_parent_platdata(dev);
        debug("%s: Probing '%s', plat=%p\n", __func__, dev->name, plat);
        plat->devnum = udev->devnum;
-       plat->speed = udev->speed;
-       plat->slot_id = udev->slot_id;
-       plat->portnr = port;
-       debug("** device '%s': stashing slot_id=%d\n", dev->name,
-             plat->slot_id);
+       plat->udev = udev;
        priv->next_addr++;
        ret = device_probe(dev);
        if (ret) {
@@ -597,17 +593,34 @@ int usb_child_pre_probe(struct udevice *dev)
        struct usb_dev_platdata *plat = dev_get_parent_platdata(dev);
        int ret;
 
-       udev->controller_dev = usb_get_bus(dev);
-       udev->dev = dev;
-       udev->devnum = plat->devnum;
-       udev->slot_id = plat->slot_id;
-       udev->portnr = plat->portnr;
-       udev->speed = plat->speed;
-       debug("** device '%s': getting slot_id=%d\n", dev->name, plat->slot_id);
+       if (plat->udev) {
+               /*
+                * Copy over all the values set in the on stack struct
+                * usb_device in usb_scan_device() to our final struct
+                * usb_device for this dev.
+                */
+               *udev = *(plat->udev);
+               /* And clear plat->udev as it will not be valid for long */
+               plat->udev = NULL;
+               udev->dev = dev;
+       } else {
+               /*
+                * This happens with devices which are explicitly bound
+                * instead of being discovered through usb_scan_device()
+                * such as sandbox emul devices.
+                */
+               udev->dev = dev;
+               udev->controller_dev = usb_get_bus(dev);
+               udev->devnum = plat->devnum;
 
-       ret = usb_select_config(udev);
-       if (ret)
-               return ret;
+               /*
+                * udev did not go through usb_scan_device(), so we need to
+                * select the config and read the config descriptors.
+                */
+               ret = usb_select_config(udev);
+               if (ret)
+                       return ret;
+       }
 
        return 0;
 }