dm: exynos: dts: Adjust device tree files for U-Boot

[karo-tx-uboot.git] / common / cmd_usb_mass_storage.c

diff --git a/common/cmd_usb_mass_storage.c b/common/cmd_usb_mass_storage.c
index b5954fc5c6e5a8ab75cf6cc20d25db0866033264..2c879ea0837c5e13e69fb60333bb921e68b2d991 100644 (file)
--- a/common/cmd_usb_mass_storage.c
+++ b/common/cmd_usb_mass_storage.c
@@ -65,25 +65,38 @@ struct ums *ums_init(const char *devtype, const char *devnum)
 int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
                               int argc, char * const argv[])
 {
+       const char *usb_controller;
+       const char *devtype;
+       const char *devnum;
+       struct ums *ums;
+       unsigned int controller_index;
+       int rc;
+       int cable_ready_timeout __maybe_unused;
+
        if (argc < 3)
                return CMD_RET_USAGE;
 
-       const char *usb_controller = argv[1];
-       const char *devtype = "mmc";
-       const char *devnum  = argv[2];
+       usb_controller = argv[1];
+       if (argc >= 4) {
+               devtype = argv[2];
+               devnum  = argv[3];
+       } else {
+               devtype = "mmc";
+               devnum  = argv[2];
+       }
 
-       struct ums *ums = ums_init(devtype, devnum);
+       ums = ums_init(devtype, devnum);
        if (!ums)
                return CMD_RET_FAILURE;
 
-       unsigned int controller_index = (unsigned int)(simple_strtoul(
-                                       usb_controller, NULL, 0));
+       controller_index = (unsigned int)(simple_strtoul(
+                               usb_controller, NULL, 0));
        if (board_usb_init(controller_index, USB_INIT_DEVICE)) {
                error("Couldn't init USB controller.");
                return CMD_RET_FAILURE;
        }
 
-       int rc = fsg_init(ums);
+       rc = fsg_init(ums);
        if (rc) {
                error("fsg_init failed");
                return CMD_RET_FAILURE;
@@ -96,7 +109,7 @@ int do_usb_mass_storage(cmd_tbl_t *cmdtp, int flag,
        }
 
        /* Timeout unit: seconds */
-       int cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;
+       cable_ready_timeout = UMS_CABLE_READY_TIMEOUT;
 
        if (!g_dnl_board_usb_cable_connected()) {
                /*
@@ -144,7 +157,8 @@ exit:
        return CMD_RET_SUCCESS;
 }
 
-U_BOOT_CMD(ums, CONFIG_SYS_MAXARGS, 1, do_usb_mass_storage,
+U_BOOT_CMD(ums, 4, 1, do_usb_mass_storage,
        "Use the UMS [User Mass Storage]",
-       "ums <USB_controller> <mmc_dev>  e.g. ums 0 0"
+       "ums <USB_controller> [<devtype>] <devnum>  e.g. ums 0 mmc 0\n"
+       "    devtype defaults to mmc"
 );