diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-31 12:48:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-31 12:48:08 -0400 |
| commit | 77680d8f85b94ffe690b8fe1f35767aef8b1415a (patch) | |
| tree | d86e9bdec5ec082d71dd02ac07032c183dc511dc | |
| parent | e63a3130e99faf0cf4dc67c4bbb92d028ffd69ee (diff) | |
| parent | 1833e68c4f05fe7b3e502135dbc0ffa09327850d (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-usb
- usb_mass_storage, xhci-brcm bugfixes
| -rw-r--r-- | cmd/usb_mass_storage.c | 4 | ||||
| -rw-r--r-- | drivers/usb/host/xhci-brcm.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index 14fa7233c7..d4e619b842 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -74,8 +74,8 @@ static int ums_init(const char *devtype, const char *devnums_part_str) if (!devnum_part_str) break; - partnum = blk_get_device_part_str(devtype, devnum_part_str, - &block_dev, &info, 1); + partnum = part_get_info_by_dev_and_name_or_num(devtype, devnum_part_str, + &block_dev, &info, 1); if (partnum < 0) goto cleanup; diff --git a/drivers/usb/host/xhci-brcm.c b/drivers/usb/host/xhci-brcm.c index 27c4bbfcba..fe17924028 100644 --- a/drivers/usb/host/xhci-brcm.c +++ b/drivers/usb/host/xhci-brcm.c @@ -8,6 +8,7 @@ #include <fdtdec.h> #include <usb.h> #include <asm/io.h> +#include <dm/device_compat.h> #include <usb/xhci.h> #define DRD2U3H_XHC_REGS_AXIWRA 0xC08 |