diff options
| author | Tom Rini <[email protected]> | 2026-03-23 09:15:33 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-03-23 09:15:33 -0600 |
| commit | 056d77e93d39d8cc8f8de158214a5ea2555f8a31 (patch) | |
| tree | 9ffaed89c18f5a2193299a8d06e491dd363dcb40 | |
| parent | e853610b560c072dd7207f2ccff01772aff1b748 (diff) | |
| parent | 9936e1083dd8c45cd10e7497bd83933b28096dcf (diff) | |
Merge tag 'mmc-next-2026-03-23' of https://source.denx.de/u-boot/custodians/u-boot-mmc into next
CI: https://source.denx.de/u-boot/custodians/u-boot-mmc/-/pipelines/29613
- Add missing quote in error message in regulator
- Support for emmc 5.1b specification
| -rw-r--r-- | drivers/mmc/mmc.c | 3 | ||||
| -rw-r--r-- | drivers/power/regulator/regulator-uclass.c | 2 | ||||
| -rw-r--r-- | include/mmc.h | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index c5705f4f215..f0e38efb262 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2343,7 +2343,8 @@ static int mmc_startup_v4(struct mmc *mmc) MMC_VERSION_4_41, MMC_VERSION_4_5, MMC_VERSION_5_0, - MMC_VERSION_5_1 + MMC_VERSION_5_1, + MMC_VERSION_5_1B }; #if CONFIG_IS_ENABLED(MMC_TINY) diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 94c52cf555b..1c7f75a9338 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -449,7 +449,7 @@ static int regulator_post_bind(struct udevice *dev) } if (!regulator_name_is_unique(dev, uc_pdata->name)) { - dev_err(dev, "'%s' has nonunique value: '%s\n", + dev_err(dev, "'%s' has nonunique value: '%s'\n", property, uc_pdata->name); return -EINVAL; } diff --git a/include/mmc.h b/include/mmc.h index 51d3f2f8dd5..9509c9e9543 100644 --- a/include/mmc.h +++ b/include/mmc.h @@ -54,6 +54,7 @@ struct bd_info; #define MMC_VERSION_4_5 MAKE_MMC_VERSION(4, 5, 0) #define MMC_VERSION_5_0 MAKE_MMC_VERSION(5, 0, 0) #define MMC_VERSION_5_1 MAKE_MMC_VERSION(5, 1, 0) +#define MMC_VERSION_5_1B MAKE_MMC_VERSION(5, 1, 0xB) #define MMC_CAP(mode) (1 << mode) #define MMC_MODE_HS (MMC_CAP(MMC_HS) | MMC_CAP(SD_HS)) |