Merge https://source.denx.de/u-boot/custodians/u-boot-usb
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c
index fcaeab9..cae570c 100644
--- a/drivers/usb/cdns3/gadget.c
+++ b/drivers/usb/cdns3/gadget.c
@@ -82,6 +82,9 @@
struct usb_request *request,
gfp_t gfp_flags);
+static void cdns3_gadget_udc_set_speed(struct usb_gadget *gadget,
+ enum usb_device_speed speed);
+
/**
* cdns3_set_register_bit - set bit in given register.
* @ptr: address of device controller register to be read and changed
@@ -2341,6 +2344,7 @@
spin_lock_irqsave(&priv_dev->lock, flags);
priv_dev->gadget_driver = driver;
+ cdns3_gadget_udc_set_speed(gadget, gadget->max_speed);
cdns3_gadget_config(priv_dev);
spin_unlock_irqrestore(&priv_dev->lock, flags);
return 0;
diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index fae2083..a9ed5e7 100644
--- a/drivers/usb/host/ehci-mx6.c
+++ b/drivers/usb/host/ehci-mx6.c
@@ -709,18 +709,6 @@
goto err_regulator;
#endif
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
- if (priv->vbus_supply) {
- ret = regulator_set_enable(priv->vbus_supply,
- (type == USB_INIT_DEVICE) ?
- false : true);
- if (ret && ret != -ENOSYS) {
- printf("Error enabling VBUS supply (ret=%i)\n", ret);
- goto err_clk;
- }
- }
-#endif
-
if (priv->init_type == USB_INIT_HOST) {
setbits_le32(&ehci->usbmode, CM_HOST);
writel(mx6_portsc(priv->phy_type), &ehci->portsc);
@@ -744,10 +732,6 @@
generic_shutdown_phy(&priv->phy);
err_regulator:
#endif
-#if CONFIG_IS_ENABLED(DM_REGULATOR)
- if (priv->vbus_supply)
- regulator_set_enable(priv->vbus_supply, false);
-#endif
err_clk:
#if CONFIG_IS_ENABLED(CLK)
clk_disable(&priv->clk);
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 9e33c5d..5cacf07 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1418,7 +1418,6 @@
return 0;
err:
- free(ctrl);
debug("%s: failed, ret=%d\n", __func__, ret);
return ret;
}