From: Tom Rini <trini@konsulko.com>
Date: Mon, 9 Sep 2019 01:14:22 +0000 (-0400)
Subject: Merge tag 'mmc-9-6-2019' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
X-Git-Tag: v2019.10-rc4~17
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=40e362a9ab5f1d409822942ee89d4473c2e01ee6;p=oweals%2Fu-boot.git

Merge tag 'mmc-9-6-2019' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc

Bug fixes to mmc_spi
Add Aspeed SD driver
Fix dw_mmc timeout calculation
Fix timeout values passed to mmc_wait_dat0
sdhci dt caps/mask update

[trini: Fix evb-ast2500_defconfig CONFIG_MMC line]
Signed-off-by: Tom Rini <trini@konsulko.com>
---

40e362a9ab5f1d409822942ee89d4473c2e01ee6
diff --cc configs/evb-ast2500_defconfig
index 59d41cb568,b47ca5b52a..299fbfe94a
--- a/configs/evb-ast2500_defconfig
+++ b/configs/evb-ast2500_defconfig
@@@ -23,7 -24,7 +24,6 @@@ CONFIG_REGMAP=
  CONFIG_CLK=y
  CONFIG_DM_I2C=y
  CONFIG_SYS_I2C_ASPEED=y
--# CONFIG_MMC is not set
  CONFIG_PHY_REALTEK=y
  CONFIG_DM_ETH=y
  CONFIG_FTGMAC100=y