Merge patch series "clk: mediatek: add OPs to support OF_UPSTREAM"

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

diff --git a/cmd/thordown.c b/cmd/thordown.c
index ce3660d174791b378c8e4b16a849a9c9b2fdc04e..70061bf8d4cccb4013b1b83310806f2ae197f576 100644 (file)
--- a/cmd/thordown.c
+++ b/cmd/thordown.c
@@ -6,56 +6,69 @@
  * All rights reserved.
  */
 
-#include <common.h>
+#include <command.h>
 #include <thor.h>
 #include <dfu.h>
 #include <g_dnl.h>
 #include <usb.h>
+#include <linux/printk.h>
 
-int do_thor_down(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+int do_thor_down(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 {
+       char *interface, *devstring;
+       int controller_index;
+       struct udevice *udc;
+       int ret;
+
        if (argc < 4)
                return CMD_RET_USAGE;
 
-       char *usb_controller = argv[1];
-       char *interface = argv[2];
-       char *devstring = argv[3];
-
-       int ret;
-
        puts("TIZEN \"THOR\" Downloader\n");
 
+       interface = argv[2];
+       devstring = argv[3];
+
        ret = dfu_init_env_entities(interface, devstring);
        if (ret)
                goto done;
 
-       int controller_index = simple_strtoul(usb_controller, NULL, 0);
-       ret = usb_gadget_initialize(controller_index);
+       controller_index = simple_strtoul(argv[1], NULL, 0);
+       ret = udc_device_get_by_index(controller_index, &udc);
        if (ret) {
                pr_err("USB init failed: %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
-       g_dnl_register("usb_dnl_thor");
-
-       ret = thor_init();
+       ret = g_dnl_register("usb_dnl_thor");
        if (ret) {
-               pr_err("THOR DOWNLOAD failed: %d\n", ret);
+               pr_err("g_dnl_register failed %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
-       ret = thor_handle();
+       ret = thor_init(udc);
        if (ret) {
-               pr_err("THOR failed: %d\n", ret);
+               pr_err("THOR DOWNLOAD failed: %d\n", ret);
                ret = CMD_RET_FAILURE;
                goto exit;
        }
 
+       do {
+               ret = thor_handle(udc);
+               if (ret == THOR_DFU_REINIT_NEEDED) {
+                       dfu_free_entities();
+                       ret = dfu_init_env_entities(interface, devstring);
+               }
+               if (ret) {
+                       pr_err("THOR failed: %d\n", ret);
+                       ret = CMD_RET_FAILURE;
+                       goto exit;
+               }
+       } while (ret == 0);
 exit:
        g_dnl_unregister();
-       usb_gadget_release(controller_index);
+       udc_device_put(udc);
 done:
        dfu_free_entities();
 
@@ -65,7 +78,7 @@ done:
 U_BOOT_CMD(thordown, CONFIG_SYS_MAXARGS, 1, do_thor_down,
           "TIZEN \"THOR\" downloader",
           "<USB_controller> <interface> <dev>\n"
-          "  - device software upgrade via LTHOR TIZEN dowload\n"
+          "  - device software upgrade via LTHOR TIZEN download\n"
           "    program via <USB_controller> on device <dev>,\n"
           "    attached to interface <interface>\n"
 );