diff options
| author | Tom Rini <trini@konsulko.com> | 2023-09-16 12:14:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-09-16 12:14:08 -0400 |
| commit | 8fcd28aae590cdca86f497f1e2431f6e4af1b268 (patch) | |
| tree | 3daf43bed41e1ff8eed9f8e1a020bf10319e9095 /cmd/usb_mass_storage.c | |
| parent | 2fe4b54556ea6271237b35de68dc458bfceab94c (diff) | |
| parent | 2caf974b5fac69a1b778e64503f2c107a8d7c3a3 (diff) | |
Merge branch 'next' of git://source.denx.de/u-boot-usb into next
- Rework gadget device handling
Diffstat (limited to 'cmd/usb_mass_storage.c')
| -rw-r--r-- | cmd/usb_mass_storage.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c index c3cc1975f9..9c51ae0967 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -143,6 +143,7 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, const char *devtype; const char *devnum; unsigned int controller_index; + struct udevice *udc; int rc; int cable_ready_timeout __maybe_unused; @@ -164,13 +165,14 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, controller_index = (unsigned int)(simple_strtoul( usb_controller, NULL, 0)); - if (usb_gadget_initialize(controller_index)) { + rc = udc_device_get_by_index(controller_index, &udc); + if (rc) { pr_err("Couldn't init USB controller.\n"); rc = CMD_RET_FAILURE; goto cleanup_ums_init; } - rc = fsg_init(ums, ums_count, controller_index); + rc = fsg_init(ums, ums_count, udc); if (rc) { pr_err("fsg_init failed\n"); rc = CMD_RET_FAILURE; @@ -215,7 +217,7 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, } while (1) { - usb_gadget_handle_interrupts(controller_index); + dm_usb_gadget_handle_interrupts(udc); rc = fsg_main_thread(NULL); if (rc) { @@ -247,7 +249,7 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag, cleanup_register: g_dnl_unregister(); cleanup_board: - usb_gadget_release(controller_index); + udc_device_put(udc); cleanup_ums_init: ums_fini(); |