Merge tag 'efi-2025-01-rc1-2' of https://source.denx.de/u-boot/custodians/u-boot-efi

[J-u-boot.git] / cmd / usb_gadget_sdp.c

diff --git a/cmd/usb_gadget_sdp.c b/cmd/usb_gadget_sdp.c
index ae4d73c1250d02eb082d65ea687c2d6ad663412e..39259a3b09253cb643f26f4f2f98c79745fbff62 100644 (file)
--- a/cmd/usb_gadget_sdp.c
+++ b/cmd/usb_gadget_sdp.c
@@ -1,46 +1,54 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * cmd_sdp.c -- sdp command
  *
  * Copyright (C) 2016 Toradex
  * Author: Stefan Agner <[email protected]>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
+#include <command.h>
 #include <g_dnl.h>
 #include <sdp.h>
 #include <usb.h>
+#include <linux/printk.h>
 
-static int do_sdp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_sdp(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
-       int ret = CMD_RET_FAILURE;
+       int controller_index;
+       struct udevice *udc;
+       int ret;
 
        if (argc < 2)
                return CMD_RET_USAGE;
 
-       char *usb_controller = argv[1];
-       int controller_index = simple_strtoul(usb_controller, NULL, 0);
-       board_usb_init(controller_index, USB_INIT_DEVICE);
+       controller_index = simple_strtoul(argv[1], NULL, 0);
+       ret = udc_device_get_by_index(controller_index, &udc);
+       if (ret)
+               return ret;
 
        g_dnl_clear_detach();
-       g_dnl_register("usb_dnl_sdp");
+       ret = g_dnl_register("usb_dnl_sdp");
+       if (ret) {
+               pr_err("SDP dnl register failed: %d\n", ret);
+               goto exit_register;
+       }
 
-       ret = sdp_init(controller_index);
+       ret = sdp_init(udc);
        if (ret) {
-               pr_err("SDP init failed: %d", 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);
-       pr_err("SDP ended");
+       sdp_handle(udc);
+       pr_err("SDP ended\n");
 
 exit:
        g_dnl_unregister();
-       board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+exit_register:
+       udc_device_put(udc);
 
-       return ret;
+       return CMD_RET_FAILURE;
 }
 
 U_BOOT_CMD(sdp, 2, 1, do_sdp,