1 files changed, 14 insertions, 2 deletions

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 6f8ebd6caa4c..4466f5de54d4 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1282,6 +1282,10 @@ int mmc_hs400_to_hs200(struct mmc_card *card)
 
         mmc_set_bus_speed(card);
 
+        /* Prepare tuning for HS400 mode. */
+        if (host->ops->prepare_hs400_tuning)
+                host->ops->prepare_hs400_tuning(host, &host->ios);
+
         return 0;
 
 out_err:
@@ -1830,6 +1834,14 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
                 }
         }
 
+        if (host->caps2 & MMC_CAP2_AVOID_3_3V &&
+            host->ios.signal_voltage == MMC_SIGNAL_VOLTAGE_330) {
+                pr_err("%s: Host failed to negotiate down from 3.3V\n",
+                        mmc_hostname(host));
+                err = -EINVAL;
+                goto free_card;
+        }
+
         if (!oldcard)
                 host->card = card;
 
@@ -2117,7 +2129,7 @@ static int mmc_can_reset(struct mmc_card *card)
         return 1;
 }
 
-static int mmc_reset(struct mmc_host *host)
+static int _mmc_hw_reset(struct mmc_host *host)
 {
         struct mmc_card *card = host->card;
 
@@ -2151,7 +2163,7 @@ static const struct mmc_bus_ops mmc_ops = {
         .runtime_resume = mmc_runtime_resume,
         .alive = mmc_alive,
         .shutdown = mmc_shutdown,
-        .reset = mmc_reset,
+        .hw_reset = _mmc_hw_reset,
 };
 
 /*