Merge tag 'efi-2020-04-rc2' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

[oweals/u-boot.git] / drivers / mmc / mmc-uclass.c

diff --git a/drivers/mmc/mmc-uclass.c b/drivers/mmc/mmc-uclass.c
index 8bf63bbd9caba6d09e93e13cba01027f3dc0994a..c7a832ca900a6bfe0b8cee2aa17e6d351ca8cd2f 100644 (file)
--- a/drivers/mmc/mmc-uclass.c
+++ b/drivers/mmc/mmc-uclass.c
@@ -47,18 +47,18 @@ int mmc_set_ios(struct mmc *mmc)
        return dm_mmc_set_ios(mmc->dev);
 }
 
-int dm_mmc_wait_dat0(struct udevice *dev, int state, int timeout)
+int dm_mmc_wait_dat0(struct udevice *dev, int state, int timeout_us)
 {
        struct dm_mmc_ops *ops = mmc_get_ops(dev);
 
        if (!ops->wait_dat0)
                return -ENOSYS;
-       return ops->wait_dat0(dev, state, timeout);
+       return ops->wait_dat0(dev, state, timeout_us);
 }
 
-int mmc_wait_dat0(struct mmc *mmc, int state, int timeout)
+int mmc_wait_dat0(struct mmc *mmc, int state, int timeout_us)
 {
-       return dm_mmc_wait_dat0(mmc->dev, state, timeout);
+       return dm_mmc_wait_dat0(mmc->dev, state, timeout_us);
 }
 
 int dm_mmc_get_wp(struct udevice *dev)
@@ -122,6 +122,20 @@ int mmc_set_enhanced_strobe(struct mmc *mmc)
 }
 #endif
 
+int dm_mmc_host_power_cycle(struct udevice *dev)
+{
+       struct dm_mmc_ops *ops = mmc_get_ops(dev);
+
+       if (ops->host_power_cycle)
+               return ops->host_power_cycle(dev);
+       return 0;
+}
+
+int mmc_host_power_cycle(struct mmc *mmc)
+{
+       return dm_mmc_host_power_cycle(mmc->dev);
+}
+
 int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg)
 {
        int val;
@@ -172,6 +186,8 @@ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg)
                cfg->host_caps |= MMC_CAP(MMC_HS_400);
        if (dev_read_bool(dev, "mmc-hs400-1_2v"))
                cfg->host_caps |= MMC_CAP(MMC_HS_400);
+       if (dev_read_bool(dev, "mmc-hs400-enhanced-strobe"))
+               cfg->host_caps |= MMC_CAP(MMC_HS_400_ES);
 
        if (dev_read_bool(dev, "non-removable")) {
                cfg->host_caps |= MMC_CAP_NONREMOVABLE;
@@ -182,6 +198,11 @@ int mmc_of_parse(struct udevice *dev, struct mmc_config *cfg)
                        cfg->host_caps |= MMC_CAP_NEEDS_POLL;
        }
 
+       if (dev_read_bool(dev, "no-1-8-v")) {
+               cfg->host_caps &= ~(UHS_CAPS | MMC_MODE_HS200 |
+                                   MMC_MODE_HS400 | MMC_MODE_HS400_ES);
+       }
+
        return 0;
 }
 
@@ -353,6 +374,7 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart)
        struct udevice *mmc_dev = dev_get_parent(bdev);
        struct mmc *mmc = mmc_get_mmc_dev(mmc_dev);
        struct blk_desc *desc = dev_get_uclass_platdata(bdev);
+       int ret;
 
        if (desc->hwpart == hwpart)
                return 0;
@@ -360,7 +382,11 @@ static int mmc_select_hwpart(struct udevice *bdev, int hwpart)
        if (mmc->part_config == MMCPART_NOAVAILABLE)
                return -EMEDIUMTYPE;
 
-       return mmc_switch_part(mmc, hwpart);
+       ret = mmc_switch_part(mmc, hwpart);
+       if (!ret)
+               blkcache_invalidate(desc->if_type, desc->devnum);
+
+       return ret;
 }
 
 static int mmc_blk_probe(struct udevice *dev)
@@ -415,10 +441,6 @@ U_BOOT_DRIVER(mmc_blk) = {
 };
 #endif /* CONFIG_BLK */
 
-U_BOOT_DRIVER(mmc) = {
-       .name   = "mmc",
-       .id     = UCLASS_MMC,
-};
 
 UCLASS_DRIVER(mmc) = {
        .id             = UCLASS_MMC,