1 files changed, 45 insertions, 34 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c7851c0aabce..6f0bfc0c8c9c 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1618,7 +1618,7 @@ static int sdhci_do_3_3v_signal_voltage_switch(struct sdhci_host *host,
         sdhci_writew(host, ctrl, SDHCI_HOST_CONTROL2);
 
         if (host->vqmmc) {
-                ret = regulator_set_voltage(host->vqmmc, 3300000, 3300000);
+                ret = regulator_set_voltage(host->vqmmc, 2700000, 3600000);
                 if (ret) {
                         pr_warning("%s: Switching to 3.3V signalling voltage "
                                    " failed\n", mmc_hostname(host->mmc));
@@ -1662,7 +1662,7 @@ static int sdhci_do_1_8v_signal_voltage_switch(struct sdhci_host *host,
                  */
                 if (host->vqmmc)
                         ret = regulator_set_voltage(host->vqmmc,
-                                1800000, 1800000);
+                                1700000, 1950000);
                 else
                         ret = 0;
 
@@ -1994,30 +1994,11 @@ static void sdhci_enable_preset_value(struct mmc_host *mmc, bool enable)
         sdhci_runtime_pm_put(host);
 }
 
-static const struct mmc_host_ops sdhci_ops = {
-        .request        = sdhci_request,
-        .set_ios        = sdhci_set_ios,
-        .get_ro         = sdhci_get_ro,
-        .hw_reset       = sdhci_hw_reset,
-        .enable_sdio_irq = sdhci_enable_sdio_irq,
-        .start_signal_voltage_switch    = sdhci_start_signal_voltage_switch,
-        .execute_tuning                 = sdhci_execute_tuning,
-        .enable_preset_value            = sdhci_enable_preset_value,
-};
-
-/*****************************************************************************\
- *                                                                           *
- * Tasklets                                                                  *
- *                                                                           *
-\*****************************************************************************/
-
-static void sdhci_tasklet_card(unsigned long param)
+static void sdhci_card_event(struct mmc_host *mmc)
 {
-        struct sdhci_host *host;
+        struct sdhci_host *host = mmc_priv(mmc);
         unsigned long flags;
 
-        host = (struct sdhci_host*)param;
-
         spin_lock_irqsave(&host->lock, flags);
 
         /* Check host->mrq first in case we are runtime suspended */
@@ -2036,6 +2017,31 @@ static void sdhci_tasklet_card(unsigned long param)
         }
 
         spin_unlock_irqrestore(&host->lock, flags);
+}
+
+static const struct mmc_host_ops sdhci_ops = {
+        .request        = sdhci_request,
+        .set_ios        = sdhci_set_ios,
+        .get_ro         = sdhci_get_ro,
+        .hw_reset       = sdhci_hw_reset,
+        .enable_sdio_irq = sdhci_enable_sdio_irq,
+        .start_signal_voltage_switch    = sdhci_start_signal_voltage_switch,
+        .execute_tuning                 = sdhci_execute_tuning,
+        .enable_preset_value            = sdhci_enable_preset_value,
+        .card_event                     = sdhci_card_event,
+};
+
+/*****************************************************************************\
+ *                                                                           *
+ * Tasklets                                                                  *
+ *                                                                           *
+\*****************************************************************************/
+
+static void sdhci_tasklet_card(unsigned long param)
+{
+        struct sdhci_host *host = (struct sdhci_host*)param;
+
+        sdhci_card_event(host->mmc);
 
         mmc_detect_change(host->mmc, msecs_to_jiffies(200));
 }
@@ -2282,6 +2288,8 @@ static void sdhci_data_irq(struct sdhci_host *host, u32 intmask)
                 pr_err("%s: ADMA error\n", mmc_hostname(host->mmc));
                 sdhci_show_adma_error(host);
                 host->data->error = -EIO;
+                if (host->ops->adma_workaround)
+                        host->ops->adma_workaround(host, intmask);
         }
 
         if (host->data->error)
@@ -2858,10 +2866,16 @@ int sdhci_add_host(struct sdhci_host *host)
                                 mmc_hostname(mmc));
                         host->vqmmc = NULL;
                 }
-        }
-        else if (regulator_is_supported_voltage(host->vqmmc, 1800000, 1800000))
+        } else {
                 regulator_enable(host->vqmmc);
-        else
+                if (!regulator_is_supported_voltage(host->vqmmc, 1700000,
+                        1950000))
+                        caps[1] &= ~(SDHCI_SUPPORT_SDR104 |
+                                        SDHCI_SUPPORT_SDR50 |
+                                        SDHCI_SUPPORT_DDR50);
+        }
+
+        if (host->quirks2 & SDHCI_QUIRK2_NO_1_8_V)
                 caps[1] &= ~(SDHCI_SUPPORT_SDR104 | SDHCI_SUPPORT_SDR50 |
                        SDHCI_SUPPORT_DDR50);
 
@@ -2919,21 +2933,18 @@ int sdhci_add_host(struct sdhci_host *host)
                                 mmc_hostname(mmc));
                         host->vmmc = NULL;
                 }
-        } else
-                regulator_enable(host->vmmc);
+        }
 
 #ifdef CONFIG_REGULATOR
         if (host->vmmc) {
-                ret = regulator_is_supported_voltage(host->vmmc, 3300000,
-                        3300000);
+                ret = regulator_is_supported_voltage(host->vmmc, 2700000,
+                        3600000);
                 if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_330)))
                         caps[0] &= ~SDHCI_CAN_VDD_330;
-                ret = regulator_is_supported_voltage(host->vmmc, 3000000,
-                        3000000);
                 if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_300)))
                         caps[0] &= ~SDHCI_CAN_VDD_300;
-                ret = regulator_is_supported_voltage(host->vmmc, 1800000,
-                        1800000);
+                ret = regulator_is_supported_voltage(host->vmmc, 1700000,
+                        1950000);
                 if ((ret <= 0) || (!(caps[0] & SDHCI_CAN_VDD_180)))
                         caps[0] &= ~SDHCI_CAN_VDD_180;
         }