Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-11 15:34:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge tag 'u-boot-dfu-20250321' of https://source.denx.de/u-boot/custodians/u-boot-dfu

Browse source 
u-boot-dfu-20250321

Usb gadget:
- Fix NXP UUU tool compatibility regression with dwc3 gadget
This commit is contained in:
Tom Rini 2025-03-21 07:29:08 -06:00
commit 244e61fbb7
1 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/usb/dwc3/gadget.c
View file

@ -1631,8 +1631,25 @@ usb_ep *dwc3_gadget_match_ep(struct usb_gadget *gadget,
return dwc3_find_ep(gadget, "ep1in");
if (usb_endpoint_is_bulk_out(desc))
return dwc3_find_ep(gadget, "ep2out");
if (usb_endpoint_is_int_in(desc))
if (usb_endpoint_is_int_in(desc)) {
/*
* Special workaround for NXP UUU tool in SPL.
*
* The tool excepts the interrupt-in endpoint to be ep1in,
* otherwise it crashes. This is a result of the previous
* hard-coded EP setup in drivers/usb/gadget/epautoconf.c
* which did special-case EP allocation for SPL builds,
* and which was since converted to this callback, but
* without the special-case EP allocation in SPL part.
*
* This reinstates the SPL part in an isolated manner,
* only for NXP iMX SoCs, only for SPL builds, and only
* for the ep1in interrupt-in endpoint.
*/
if (IS_ENABLED(CONFIG_MACH_IMX) && IS_ENABLED(CONFIG_XPL_BUILD))
return dwc3_find_ep(gadget, "ep1in");
return dwc3_find_ep(gadget, "ep3in");
}
return NULL;
}