mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-05-05 12:46:14 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tag 'mmc-next-2026-03-23' of https://source.denx.de/u-boot/custodians/u-boot-mmc into next

Browse Source 
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
This commit is contained in:
Tom Rini 2026-03-23 09:15:33 -06:00
commit 056d77e93d
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/mmc.c
View File

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

2
drivers/power/regulator/regulator-uclass.c
View File

@ -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;
}

1
include/mmc.h
View File

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