usb: board_usb_init and board_usb_cleanup calls in the fastboot command

Each USB download function command calls board_usb_init before registering the
USB gadget and board_usb_cleanup after de-registering it. On devices currently
using fasboot, musb-new is usually initialized earlier, but some other boards
might need the board_usb_init call to properly initialize musb-new.

This requires adding an argument (the USB controller index) to the fastboot
command, as it is currently done with other USB download gadget functions.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>
Test HW: Odroid_XU3 (Exynos5422), trats (Exynos4210)

diff --git a/common/cmd_fastboot.c b/common/cmd_fastboot.c
index d52ccfb3100eb8450af627c269202b57e7d35071..86fbddfcc63d7213c6758706e7730137814698da 100644 (file)
--- a/common/cmd_fastboot.c
+++ b/common/cmd_fastboot.c
@@ -10,11 +10,26 @@
 #include <common.h>
 #include <command.h>
 #include <g_dnl.h>
+#include <usb.h>
 
 static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
 {
+       int controller_index;
+       char *usb_controller;
        int ret;
 
+       if (argc < 2)
+               return CMD_RET_USAGE;
+
+       usb_controller = argv[1];
+       controller_index = simple_strtoul(usb_controller, NULL, 0);
+
+       ret = board_usb_init(controller_index, USB_INIT_DEVICE);
+       if (ret) {
+               error("USB init failed: %d", ret);
+               return CMD_RET_FAILURE;
+       }
+
        g_dnl_clear_detach();
        ret = g_dnl_register("usb_dnl_fastboot");
        if (ret)
@@ -23,9 +38,8 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
        if (!g_dnl_board_usb_cable_connected()) {
                puts("\rUSB cable not detected.\n" \
                     "Command exit.\n");
-               g_dnl_unregister();
-               g_dnl_clear_detach();
-               return CMD_RET_FAILURE;
+               ret = CMD_RET_FAILURE;
+               goto exit;
        }
 
        while (1) {
@@ -36,14 +50,19 @@ static int do_fastboot(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[])
                usb_gadget_handle_interrupts(0);
        }
 
+       ret = CMD_RET_SUCCESS;
+
+exit:
        g_dnl_unregister();
        g_dnl_clear_detach();
-       return CMD_RET_SUCCESS;
+       board_usb_cleanup(controller_index, USB_INIT_DEVICE);
+
+       return ret;
 }
 
 U_BOOT_CMD(
-       fastboot,       1,      0,      do_fastboot,
+       fastboot, 2, 1, do_fastboot,
        "use USB Fastboot protocol",
-       "\n"
+       "<USB_controller>\n"
        "    - run as a fastboot usb device"
 );

diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h
index f3e5a7587de9483ec7319c9c7e496ba0bf001172..4179a574a9752b003adc1b6fe0a70eb46a4b69f2 100644 (file)
--- a/include/configs/ti_omap5_common.h
+++ b/include/configs/ti_omap5_common.h
@@ -135,7 +135,7 @@
        "if test ${dofastboot} -eq 1; then " \
                "echo Boot fastboot requested, resetting dofastboot ...;" \
                "setenv dofastboot 0; saveenv;" \
-               "echo Booting into fastboot ...; fastboot;" \
+               "echo Booting into fastboot ...; fastboot 0;" \
        "fi;" \
        "run findfdt; " \
        "run mmcboot;" \