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>

diff --cc configs/evb-ast2500_defconfig
index 59d41cb5687b3966bd2c7adb5dcf096b5fb39f75,b47ca5b52a93290b2e73ee1bfa929e3ccd224e38..299fbfe94af9f8480378a1920dc42b72f9fe712c
--- 1/configs/evb-ast2500_defconfig
--- 2/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