diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-14 07:28:32 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-14 07:28:32 -0400 |
| commit | fae79480111be47944cf66a9c052ff3934a09ce5 (patch) | |
| tree | 7f7e53795d9520b2a731ac4ca8b5b94223bf3aa4 /common/spl | |
| parent | 7a779ed1755c2d5011bd9598da90291f759ae760 (diff) | |
| parent | a8ef8b22896331d0be1bb4c5bef787b3f72e793e (diff) | |
| download | u-boot-fae79480111be47944cf66a9c052ff3934a09ce5.tar.gz u-boot-fae79480111be47944cf66a9c052ff3934a09ce5.tar.bz2 u-boot-fae79480111be47944cf66a9c052ff3934a09ce5.zip | |
Merge tag 'mmc-10-10-2019' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- Add sdhci driver for Broadcom iProc platform
- Add a driver callback for power-cycle for mmc
- Implement host_power_cycle callback for stm32_sdmmc2
- spl: dm_mmc: Initialize only the required mmc device
Diffstat (limited to 'common/spl')
| -rw-r--r-- | common/spl/spl_mmc.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c index c5cae97099..34e1e73d80 100644 --- a/common/spl/spl_mmc.c +++ b/common/spl/spl_mmc.c @@ -123,31 +123,25 @@ static int spl_mmc_get_device_index(u32 boot_device) static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device) { -#if CONFIG_IS_ENABLED(DM_MMC) - struct udevice *dev; -#endif int err, mmc_dev; mmc_dev = spl_mmc_get_device_index(boot_device); if (mmc_dev < 0) return mmc_dev; +#if CONFIG_IS_ENABLED(DM_MMC) + err = mmc_init_device(mmc_dev); +#else err = mmc_initialize(NULL); +#endif /* DM_MMC */ if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: could not initialize mmc. error: %d\n", err); #endif return err; } - -#if CONFIG_IS_ENABLED(DM_MMC) - err = uclass_get_device(UCLASS_MMC, mmc_dev, &dev); - if (!err) - *mmcp = mmc_get_mmc_dev(dev); -#else *mmcp = find_mmc_device(mmc_dev); err = *mmcp ? 0 : -ENODEV; -#endif if (err) { #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT printf("spl: could not find mmc device %d. error: %d\n", |