cmd: ums: Use plain udevice for UDC controller interaction

Convert to plain udevice interaction with UDC controller
device, avoid the use of UDC uclass dev_array .

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>
Tested-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> # on khadas vim3
Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index c3cc1975f9d8b2b0858f6007e89e891ec2e7e2ea..9c51ae0967f397cab78d3f5c6431ac6102575c18 100644 (file)
--- 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();
 

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index f46829eb7adb295ee7a3cfc73ac583b6f6a3a46d..1d17331cb036c256261fcfd63571504670c7ab61 100644 (file)
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -435,7 +435,7 @@ static void set_bulk_out_req_length(struct fsg_common *common,
 static struct ums *ums;
 static int ums_count;
 static struct fsg_common *the_fsg_common;
-static unsigned int controller_index;
+static struct udevice *udcdev;
 
 static int fsg_set_halt(struct fsg_dev *fsg, struct usb_ep *ep)
 {
@@ -680,7 +680,7 @@ static int sleep_thread(struct fsg_common *common)
                        k = 0;
                }
 
-               usb_gadget_handle_interrupts(controller_index);
+               dm_usb_gadget_handle_interrupts(udcdev);
        }
        common->thread_wakeup_needed = 0;
        return rc;
@@ -2764,11 +2764,11 @@ int fsg_add(struct usb_configuration *c)
        return fsg_bind_config(c->cdev, c, fsg_common);
 }
 
-int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx)
+int fsg_init(struct ums *ums_devs, int count, struct udevice *udc)
 {
        ums = ums_devs;
        ums_count = count;
-       controller_index = controller_idx;
+       udcdev = udc;
 
        return 0;
 }

diff --git a/include/usb_mass_storage.h b/include/usb_mass_storage.h
index 08ccc97cf22494a930974b24d37c09455c97446d..83ab93b530d7448e704c9ac5bdf16aa6f354c5f2 100644 (file)
--- a/include/usb_mass_storage.h
+++ b/include/usb_mass_storage.h
@@ -25,7 +25,7 @@ struct ums {
        struct blk_desc block_dev;
 };
 
-int fsg_init(struct ums *ums_devs, int count, unsigned int controller_idx);
+int fsg_init(struct ums *ums_devs, int count, struct udevice *udc);
 void fsg_cleanup(void);
 int fsg_main_thread(void *);
 int fsg_add(struct usb_configuration *c);