]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
Merge tag 'mmc-for-2026.04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-mmc
authorTom Rini <trini@konsulko.com>
Tue, 3 Feb 2026 15:13:43 +0000 (09:13 -0600)
committerTom Rini <trini@konsulko.com>
Tue, 3 Feb 2026 18:46:30 +0000 (12:46 -0600)
- Add DMA support for mediatek mmc
- Cleanup mmc cmd
- Fix typos in mmc

[trini: Fix "quoted string split across lines" checkpatch warning]
Signed-off-by: Tom Rini <trini@konsulko.com>
1  2 
cmd/mmc.c

diff --cc cmd/mmc.c
index 5340a58be8ee4ff6b83bba60faee4c67c3a72639,bcbe963f8ac0a7da21a4e0900321941682f15e24..6cb1ef5dc23e35beca912a13e90c24bfcd7e0c60
+++ b/cmd/mmc.c
@@@ -556,30 -557,27 +557,27 @@@ static int do_mmc_part(struct cmd_tbl *
  static int do_mmc_dev(struct cmd_tbl *cmdtp, int flag,
                      int argc, char *const argv[])
  {
-       int dev, part = 0, ret;
+       enum bus_mode speed_mode = MMC_MODES_END;
+       int dev = curr_device, part = 0, ret;
+       char *endp;
        struct mmc *mmc;
  
-       if (argc == 1) {
-               dev = curr_device;
-               mmc = init_mmc_device(dev, true);
-       } else if (argc == 2) {
-               dev = (int)dectoul(argv[1], NULL);
-               mmc = init_mmc_device(dev, true);
-       } else if (argc == 3) {
-               dev = (int)dectoul(argv[1], NULL);
-               part = (int)dectoul(argv[2], NULL);
-               if (part > PART_ACCESS_MASK) {
-                       printf("#part_num shouldn't be larger than %d\n",
-                              PART_ACCESS_MASK);
-                       return CMD_RET_FAILURE;
+       switch (argc) {
+       case 4:
+               speed_mode = (int)dectoul(argv[3], &endp);
+               if (*endp) {
 -                      printf("Invalid speed mode index '%s', "
 -                             "did you specify a mode name?\n", argv[3]);
++                      printf("Invalid speed mode index '%s', did you specify a mode name?\n",
++                             argv[3]);
+                       return CMD_RET_USAGE;
                }
-               mmc = init_mmc_device(dev, true);
-       } else if (argc == 4) {
-               enum bus_mode speed_mode;
  
-               dev = (int)dectoul(argv[1], NULL);
-               part = (int)dectoul(argv[2], NULL);
-               if (part > PART_ACCESS_MASK) {
+               fallthrough;
+       case 3:
+               part = (int)dectoul(argv[2], &endp);
+               if (*endp) {
+                       printf("Invalid part number '%s'\n", argv[2]);
+                       return CMD_RET_USAGE;
+               } else if (part > PART_ACCESS_MASK) {
                        printf("#part_num shouldn't be larger than %d\n",
                               PART_ACCESS_MASK);
                        return CMD_RET_FAILURE;