From: Tom Rini <trini@konsulko.com>
Date: Tue, 3 Feb 2026 15:13:43 +0000 (-0600)
Subject: Merge tag 'mmc-for-2026.04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-mmc
X-Git-Tag: v2026.04-rc2~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71f2564b178f3986dc89cdaa4558f0caa74fd88c;p=thirdparty%2Fu-boot.git

Merge tag 'mmc-for-2026.04-rc2' of https://source.denx.de/u-boot/custodians/u-boot-mmc

- 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>
---

71f2564b178f3986dc89cdaa4558f0caa74fd88c
diff --cc cmd/mmc.c
index 5340a58be8e,bcbe963f8ac..6cb1ef5dc23
--- a/cmd/mmc.c
+++ 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;