diff options
| author | Tom Rini <[email protected]> | 2025-11-04 13:06:26 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-11-04 13:06:26 -0600 |
| commit | 1c250e444ad3b15315ee8b0fcb3fc3acc26449e2 (patch) | |
| tree | 47cd432ccfc396c9fabd4631566289f120c01605 /drivers/usb | |
| parent | ef34776f21969a71594dc6224d0e54cf5a2a980c (diff) | |
| parent | 2b7892255bd617dfc523cfe8455dbf386a3dfaf5 (diff) | |
Merge tag 'u-boot-imx-master-20251104' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/28144
- Extend USB support for the i.MX9 family.
- Update memory controller for imx6ulz_smm_m2.
- Add remoteproc support for several i.MX boards.
- Add support for iMX95 15x15 EVK.
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/gadget/f_sdp.c | 2 | ||||
| -rw-r--r-- | drivers/usb/host/Kconfig | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c index 647001d8dd0..f72e27028b7 100644 --- a/drivers/usb/gadget/f_sdp.c +++ b/drivers/usb/gadget/f_sdp.c @@ -765,7 +765,7 @@ static ulong search_container_header(ulong p, int size) for (i = 0; i < size; i += 4) { hdr = (u8 *)(p + i); - if (*(hdr + 3) == 0x87 && *hdr == 0) + if (*(hdr + 3) == 0x87 && (*hdr == 0 || *hdr == 2)) if (*(hdr + 1) != 0 || *(hdr + 2) != 0) return p + i; } diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 2cf687fc4f3..427b62e934b 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -210,10 +210,10 @@ config USB_EHCI_MX6 config USB_EHCI_MX7 bool "Support for i.MX7/i.MX8M/i.MX9 on-chip EHCI USB controller" - depends on ARCH_MX7 || IMX8M || IMX93 || IMX95 + depends on ARCH_MX7 || IMX8M || IMX9 select EHCI_HCD_INIT_AFTER_RESET if ARCH_MX7 - select PHY if IMX8M || IMX93 || IMX95 - select NOP_PHY if IMX8M || IMX93 || IMX95 + select PHY if IMX8M || IMX9 + select NOP_PHY if IMX8M || IMX9 default y ---help--- Enables support for the on-chip EHCI controller on i.MX7/i.MX8M/i.MX9 SoCs. |