1 files changed, 46 insertions, 7 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index c6d1bd8d4ac4..785512133b50 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -19,6 +19,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/scatterlist.h>
+#include <linux/regulator/consumer.h>
 
 #include <linux/leds.h>
 
@@ -817,8 +818,12 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
         WARN_ON(!host->data);
 
         mode = SDHCI_TRNS_BLK_CNT_EN;
-        if (data->blocks > 1)
-                mode |= SDHCI_TRNS_MULTI;
+        if (data->blocks > 1) {
+                if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12)
+                        mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_ACMD12;
+                else
+                        mode |= SDHCI_TRNS_MULTI;
+        }
         if (data->flags & MMC_DATA_READ)
                 mode |= SDHCI_TRNS_READ;
         if (host->flags & SDHCI_REQ_USE_DMA)
@@ -1108,6 +1113,12 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
 #ifndef SDHCI_USE_LEDS_CLASS
         sdhci_activate_led(host);
 #endif
+        if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) {
+                if (mrq->stop) {
+                        mrq->data->stop = NULL;
+                        mrq->stop = NULL;
+                }
+        }
 
         host->mrq = mrq;
 
@@ -1159,6 +1170,11 @@ static void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 
         ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
 
+        if (ios->bus_width == MMC_BUS_WIDTH_8)
+                ctrl |= SDHCI_CTRL_8BITBUS;
+        else
+                ctrl &= ~SDHCI_CTRL_8BITBUS;
+
         if (ios->bus_width == MMC_BUS_WIDTH_4)
                 ctrl |= SDHCI_CTRL_4BITBUS;
         else
@@ -1603,7 +1619,10 @@ int sdhci_suspend_host(struct sdhci_host *host, pm_message_t state)
 
         free_irq(host->irq, host);
 
-        return 0;
+        if (host->vmmc)
+                ret = regulator_disable(host->vmmc);
+
+        return ret;
 }
 
 EXPORT_SYMBOL_GPL(sdhci_suspend_host);
@@ -1612,6 +1631,13 @@ int sdhci_resume_host(struct sdhci_host *host)
 {
         int ret;
 
+        if (host->vmmc) {
+                int ret = regulator_enable(host->vmmc);
+                if (ret)
+                        return ret;
+        }
+
+
         if (host->flags & (SDHCI_USE_SDMA | SDHCI_USE_ADMA)) {
                 if (host->ops->enable_dma)
                         host->ops->enable_dma(host);
@@ -1687,7 +1713,8 @@ int sdhci_add_host(struct sdhci_host *host)
                         host->version);
         }
 
-        caps = sdhci_readl(host, SDHCI_CAPABILITIES);
+        caps = (host->quirks & SDHCI_QUIRK_MISSING_CAPS) ? host->caps :
+                sdhci_readl(host, SDHCI_CAPABILITIES);
 
         if (host->quirks & SDHCI_QUIRK_FORCE_DMA)
                 host->flags |= SDHCI_USE_SDMA;
@@ -1785,13 +1812,12 @@ int sdhci_add_host(struct sdhci_host *host)
          * Set host parameters.
          */
         mmc->ops = &sdhci_ops;
-        if (host->quirks & SDHCI_QUIRK_NONSTANDARD_CLOCK &&
-                        host->ops->set_clock && host->ops->get_min_clock)
+        if (host->ops->get_min_clock)
                 mmc->f_min = host->ops->get_min_clock(host);
         else
                 mmc->f_min = host->max_clk / 256;
         mmc->f_max = host->max_clk;
-        mmc->caps = MMC_CAP_SDIO_IRQ;
+        mmc->caps |= MMC_CAP_SDIO_IRQ;
 
         if (!(host->quirks & SDHCI_QUIRK_FORCE_1_BIT_DATA))
                 mmc->caps |= MMC_CAP_4_BIT_DATA;
@@ -1884,6 +1910,14 @@ int sdhci_add_host(struct sdhci_host *host)
         if (ret)
                 goto untasklet;
 
+        host->vmmc = regulator_get(mmc_dev(mmc), "vmmc");
+        if (IS_ERR(host->vmmc)) {
+                printk(KERN_INFO "%s: no vmmc regulator found\n", mmc_hostname(mmc));
+                host->vmmc = NULL;
+        } else {
+                regulator_enable(host->vmmc);
+        }
+
         sdhci_init(host, 0);
 
 #ifdef CONFIG_MMC_DEBUG
@@ -1968,6 +2002,11 @@ void sdhci_remove_host(struct sdhci_host *host, int dead)
         tasklet_kill(&host->card_tasklet);
         tasklet_kill(&host->finish_tasklet);
 
+        if (host->vmmc) {
+                regulator_disable(host->vmmc);
+                regulator_put(host->vmmc);
+        }
+
         kfree(host->adma_desc);
         kfree(host->align_buffer);