Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-23 13:56:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge https://source.denx.de/u-boot/custodians/u-boot-usb

Browse source
This commit is contained in:
Tom Rini 2023-07-27 10:35:36 -04:00
commit c98c401dfb
3 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/usb/cdns3/gadget.c
View file

@ -82,6 +82,9 @@ static int __cdns3_gadget_ep_queue(struct usb_ep *ep,
struct usb_request *request, struct usb_request *request,
gfp_t gfp_flags); 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. * cdns3_set_register_bit - set bit in given register.
* @ptr: address of device controller register to be read and changed * @ptr: address of device controller register to be read and changed
@ -2341,6 +2344,7 @@ static int cdns3_gadget_udc_start(struct usb_gadget *gadget,
spin_lock_irqsave(&priv_dev->lock, flags); spin_lock_irqsave(&priv_dev->lock, flags);
priv_dev->gadget_driver = driver; priv_dev->gadget_driver = driver;
cdns3_gadget_udc_set_speed(gadget, gadget->max_speed);
cdns3_gadget_config(priv_dev); cdns3_gadget_config(priv_dev);
spin_unlock_irqrestore(&priv_dev->lock, flags); spin_unlock_irqrestore(&priv_dev->lock, flags);
return 0; return 0;

16
drivers/usb/host/ehci-mx6.c
View file

@ -709,18 +709,6 @@ static int ehci_usb_probe(struct udevice *dev)
goto err_regulator; goto err_regulator;
#endif #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) { if (priv->init_type == USB_INIT_HOST) {
setbits_le32(&ehci->usbmode, CM_HOST); setbits_le32(&ehci->usbmode, CM_HOST);
writel(mx6_portsc(priv->phy_type), &ehci->portsc); writel(mx6_portsc(priv->phy_type), &ehci->portsc);
@ -744,10 +732,6 @@ err_phy:
generic_shutdown_phy(&priv->phy); generic_shutdown_phy(&priv->phy);
err_regulator: err_regulator:
#endif #endif
#if CONFIG_IS_ENABLED(DM_REGULATOR)
if (priv->vbus_supply)
regulator_set_enable(priv->vbus_supply, false);
#endif
err_clk: err_clk:
#if CONFIG_IS_ENABLED(CLK) #if CONFIG_IS_ENABLED(CLK)
clk_disable(&priv->clk); clk_disable(&priv->clk);

1
drivers/usb/host/xhci.c
View file

@ -1418,7 +1418,6 @@ int xhci_register(struct udevice *dev, struct xhci_hccr *hccr,
return 0; return 0;
err: err:
free(ctrl);
debug("%s: failed, ret=%d\n", __func__, ret); debug("%s: failed, ret=%d\n", __func__, ret);
return ret; return ret;
} }