diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-06 22:42:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-06 22:42:55 -0400 |
| commit | 02395fec007657c5beb4f7fd77784e10b3054c90 (patch) | |
| tree | ef219c5928cccb889ec4a50266babb460dbe7386 /drivers/mmc/mmc.c | |
| parent | 2e216be8cf1e38df0f84963222cb6becaf0fc78e (diff) | |
| parent | 2243d19e5618122d9d7aba23eb51f63f2719dba5 (diff) | |
Merge tag 'mmc-2021-4-6' of https://source.denx.de/u-boot/custodians/u-boot-mmc
Update hwpartition usage
Check bootbus's arguments
workaround for erratum A-011334 for fsl_esdhc driver
add pulse width detection workaround for fsl_esdhc driver
Use alias num before checking mmc index when creating device
Diffstat (limited to 'drivers/mmc/mmc.c')
| -rw-r--r-- | drivers/mmc/mmc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index b4c8e7f293b..1e83007286b 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -3052,9 +3052,11 @@ int mmc_init_device(int num) struct mmc *m; int ret; - ret = uclass_get_device(UCLASS_MMC, num, &dev); - if (ret) - return ret; + if (uclass_get_device_by_seq(UCLASS_MMC, num, &dev)) { + ret = uclass_get_device(UCLASS_MMC, num, &dev); + if (ret) + return ret; + } m = mmc_get_mmc_dev(dev); if (!m) |