Merge git://git.denx.de/u-boot-samsung

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

diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 2df67404ca457a9fdd1fd8d4d72d61d7ff51eefd..7f6a9a6d0548a44bf49efb2bbd377d3a5282b8fd 100644 (file)
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -10,6 +10,7 @@
 #include <common.h>
 #include <dm.h>
 #include <errno.h>
+#include <memalign.h>
 #include <usb.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
@@ -128,6 +129,17 @@ int usb_alloc_device(struct usb_device *udev)
        return ops->alloc_device(bus, udev);
 }
 
+int usb_reset_root_port(struct usb_device *udev)
+{
+       struct udevice *bus = udev->controller_dev;
+       struct dm_usb_ops *ops = usb_get_ops(bus);
+
+       if (!ops->reset_root_port)
+               return -ENOSYS;
+
+       return ops->reset_root_port(bus, udev);
+}
+
 int usb_stop(void)
 {
        struct udevice *bus;
@@ -162,7 +174,9 @@ int usb_stop(void)
        uclass_foreach_dev(dev, uc)
                usb_emul_reset(dev);
 #endif
+#ifdef CONFIG_USB_STORAGE
        usb_stor_reset();
+#endif
        usb_hub_reset();
        uc_priv->companion_device_count = 0;
        usb_started = 0;
@@ -268,11 +282,6 @@ int usb_init(void)
        return usb_started ? 0 : -1;
 }
 
-int usb_reset_root_port(struct usb_device *udev)
-{
-       return -ENOSYS;
-}
-
 static struct usb_device *find_child_devnum(struct udevice *parent, int devnum)
 {
        struct usb_device *udev;
@@ -280,7 +289,7 @@ static struct usb_device *find_child_devnum(struct udevice *parent, int devnum)
 
        if (!device_active(parent))
                return NULL;
-       udev = dev_get_parentdata(parent);
+       udev = dev_get_parent_priv(parent);
        if (udev->devnum == devnum)
                return udev;
 
@@ -297,14 +306,14 @@ static struct usb_device *find_child_devnum(struct udevice *parent, int devnum)
 
 struct usb_device *usb_get_dev_index(struct udevice *bus, int index)
 {
-       struct udevice *hub;
+       struct udevice *dev;
        int devnum = index + 1; /* Addresses are allocated from 1 on USB */
 
-       device_find_first_child(bus, &hub);
-       if (device_get_uclass_id(hub) == UCLASS_USB_HUB)
-               return find_child_devnum(hub, devnum);
+       device_find_first_child(bus, &dev);
+       if (!dev)
+               return NULL;
 
-       return NULL;
+       return find_child_devnum(dev, devnum);
 }
 
 int usb_post_bind(struct udevice *dev)
@@ -485,15 +494,14 @@ error:
 }
 
 /**
- * usb_find_child() - Find an existing device which matches our needs
- *
- *
+ * usb_find_emul_child() - Find an existing device for emulated devices
  */
-static int usb_find_child(struct udevice *parent,
-                         struct usb_device_descriptor *desc,
-                         struct usb_interface_descriptor *iface,
-                         struct udevice **devp)
+static int usb_find_emul_child(struct udevice *parent,
+                              struct usb_device_descriptor *desc,
+                              struct usb_interface_descriptor *iface,
+                              struct udevice **devp)
 {
+#ifdef CONFIG_SANDBOX
        struct udevice *dev;
 
        *devp = NULL;
@@ -512,7 +520,7 @@ static int usb_find_child(struct udevice *parent,
                        return 0;
                }
        }
-
+#endif
        return -ENOENT;
 }
 
@@ -567,13 +575,13 @@ int usb_scan_device(struct udevice *parent, int port,
        udev->portnr = port;
        debug("Calling usb_setup_device(), portnr=%d\n", udev->portnr);
        parent_udev = device_get_uclass_id(parent) == UCLASS_USB_HUB ?
-               dev_get_parentdata(parent) : NULL;
+               dev_get_parent_priv(parent) : NULL;
        ret = usb_setup_device(udev, priv->desc_before_addr, parent_udev);
        debug("read_descriptor for '%s': ret=%d\n", parent->name, ret);
        if (ret)
                return ret;
-       ret = usb_find_child(parent, &udev->descriptor, iface, &dev);
-       debug("** usb_find_child returns %d\n", ret);
+       ret = usb_find_emul_child(parent, &udev->descriptor, iface, &dev);
+       debug("** usb_find_emul_child returns %d\n", ret);
        if (ret) {
                if (ret != -ENOENT)
                        return ret;
@@ -630,7 +638,7 @@ int usb_detect_change(void)
                        if (!device_active(dev))
                                continue;
 
-                       udev = dev_get_parentdata(dev);
+                       udev = dev_get_parent_priv(dev);
                        if (usb_get_port_status(udev, udev->portnr, &status)
                                        < 0)
                                /* USB request failed */
@@ -686,7 +694,7 @@ struct udevice *usb_get_bus(struct udevice *dev)
 
 int usb_child_pre_probe(struct udevice *dev)
 {
-       struct usb_device *udev = dev_get_parentdata(dev);
+       struct usb_device *udev = dev_get_parent_priv(dev);
        struct usb_dev_platdata *plat = dev_get_parent_platdata(dev);
        int ret;