sdp: 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>
Signed-off-by: Marek Vasut <marex@denx.de>

diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index 784d1b49768f2bbf12a01a60721d8b6906fceb35..748aa0a74888a6b9b35e6c45d80a4d4e22ed507c 100644 (file)
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -15,13 +15,16 @@
 static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
        int controller_index;
+       struct udevice *udc;
        int ret;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
        controller_index = simple_strtoul(argv[1], NULL, 0);
-       usb_gadget_initialize(controller_index);
+       ret = udc_device_get_by_index(controller_index, &udc);
+       if (ret)
+               return ret;
 
        g_dnl_clear_detach();
        ret = g_dnl_register("usb_dnl_sdp");
@@ -30,20 +33,20 @@ static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
                goto exit_register;
        }
 
-       ret = sdp_init(controller_index);
+       ret = sdp_init(udc);
        if (ret) {
                pr_err("SDP init failed: %d\n", ret);
                goto exit;
        }
 
        /* This command typically does not return but jumps to an image */
-       sdp_handle(controller_index);
+       sdp_handle(udc);
        pr_err("SDP ended\n");
 
 exit:
        g_dnl_unregister();
 exit_register:
-       usb_gadget_release(controller_index);
+       udc_device_put(udc);
 
        return CMD_RET_FAILURE;
 }

diff --git a/common/spl/spl_sdp.c b/common/spl/spl_sdp.c
index aae886d2e578a4fe7ad2bf9d56a031d5865b6f5c..5a5ccd0676cdbeaa4dac749618611e8b497f12bb 100644 (file)
--- a/common/spl/spl_sdp.c
+++ b/common/spl/spl_sdp.c
@@ -14,10 +14,13 @@
 static int spl_sdp_load_image(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
 {
-       int ret;
        const int controller_index = CONFIG_SPL_SDP_USB_DEV;
+       struct udevice *udc;
+       int ret;
 
-       usb_gadget_initialize(controller_index);
+       ret = udc_device_get_by_index(controller_index, &udc);
+       if (ret)
+               return ret;
 
        board_usb_init(controller_index, USB_INIT_DEVICE);
 
@@ -28,7 +31,7 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
                goto err_detach;
        }
 
-       ret = sdp_init(controller_index);
+       ret = sdp_init(udc);
        if (ret) {
                pr_err("SDP init failed: %d\n", ret);
                goto err_unregister;
@@ -39,13 +42,13 @@ static int spl_sdp_load_image(struct spl_image_info *spl_image,
         * or it loads a FIT image and returns it to be handled by the SPL
         * code.
         */
-       ret = spl_sdp_handle(controller_index, spl_image, bootdev);
+       ret = spl_sdp_handle(udc, spl_image, bootdev);
        debug("SDP ended\n");
 
 err_unregister:
        g_dnl_unregister();
 err_detach:
-       usb_gadget_release(controller_index);
+       udc_device_put(udc);
        return ret;
 }
 SPL_LOAD_IMAGE_METHOD("USB SDP", 0, BOOT_DEVICE_BOARD, spl_sdp_load_image);

diff --git a/drivers/usb/gadget/f_sdp.c b/drivers/usb/gadget/f_sdp.c
index 4da5a160a098933a581897c5a2dc6c60ea0d9a98..37f6281abfbecc9e7433232492b48ff608e26ae8 100644 (file)
--- a/drivers/usb/gadget/f_sdp.c
+++ b/drivers/usb/gadget/f_sdp.c
@@ -702,7 +702,7 @@ static int sdp_bind_config(struct usb_configuration *c)
        return status;
 }
 
-int sdp_init(int controller_index)
+int sdp_init(struct udevice *udc)
 {
        printf("SDP: initialize...\n");
        while (!sdp_func->configuration_done) {
@@ -712,7 +712,7 @@ int sdp_init(int controller_index)
                }
 
                schedule();
-               usb_gadget_handle_interrupts(controller_index);
+               dm_usb_gadget_handle_interrupts(udc);
        }
 
        return 0;
@@ -911,9 +911,9 @@ static void sdp_handle_out_ep(void)
 }
 
 #ifndef CONFIG_SPL_BUILD
-int sdp_handle(int controller_index)
+int sdp_handle(struct udevice *udc)
 #else
-int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
+int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image,
                   struct spl_boot_device *bootdev)
 #endif
 {
@@ -929,7 +929,7 @@ int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
                        return 0;
 
                schedule();
-               usb_gadget_handle_interrupts(controller_index);
+               dm_usb_gadget_handle_interrupts(udc);
 
 #ifdef CONFIG_SPL_BUILD
                flag = sdp_handle_in_ep(spl_image, bootdev);

diff --git a/include/sdp.h b/include/sdp.h
index 6d89baa04ec527ce5f370cbab8ae7ba711e6d730..5492f9c47d29983ccf61d044e28558018ac9c672 100644 (file)
--- a/include/sdp.h
+++ b/include/sdp.h
@@ -9,15 +9,15 @@
 #ifndef __SDP_H_
 #define __SDP_H_
 
-int sdp_init(int controller_index);
+int sdp_init(struct udevice *udc);
 
 #ifdef CONFIG_SPL_BUILD
 #include <spl.h>
 
-int spl_sdp_handle(int controller_index, struct spl_image_info *spl_image,
+int spl_sdp_handle(struct udevice *udc, struct spl_image_info *spl_image,
                   struct spl_boot_device *bootdev);
 #else
-int sdp_handle(int controller_index);
+int sdp_handle(struct udevice *udc);
 #endif
 
 #endif /* __SDP_H_ */