1 files changed, 19 insertions, 1 deletions

diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 2cbb4516d353..42706ea0ba85 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -1192,11 +1192,22 @@ static void atmci_start_request(struct atmel_mci *host,
         iflags |= ATMCI_CMDRDY;
         cmd = mrq->cmd;
         cmdflags = atmci_prepare_command(slot->mmc, cmd);
-        atmci_send_command(host, cmd, cmdflags);
+
+        /*
+         * DMA transfer should be started before sending the command to avoid
+         * unexpected errors especially for read operations in SDIO mode.
+         * Unfortunately, in PDC mode, command has to be sent before starting
+         * the transfer.
+         */
+        if (host->submit_data != &atmci_submit_data_dma)
+                atmci_send_command(host, cmd, cmdflags);
 
         if (data)
                 host->submit_data(host, data);
 
+        if (host->submit_data == &atmci_submit_data_dma)
+                atmci_send_command(host, cmd, cmdflags);
+
         if (mrq->stop) {
                 host->stop_cmdr = atmci_prepare_command(slot->mmc, mrq->stop);
                 host->stop_cmdr |= ATMCI_CMDR_STOP_XFER;
@@ -1391,8 +1402,14 @@ static void atmci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
                 clk_unprepare(host->mck);
 
         switch (ios->power_mode) {
+        case MMC_POWER_OFF:
+                if (!IS_ERR(mmc->supply.vmmc))
+                        mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0);
+                break;
         case MMC_POWER_UP:
                 set_bit(ATMCI_CARD_NEED_INIT, &slot->flags);
+                if (!IS_ERR(mmc->supply.vmmc))
+                        mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, ios->vdd);
                 break;
         default:
                 /*
@@ -2204,6 +2221,7 @@ static int __init atmci_init_slot(struct atmel_mci *host,
         }
 
         host->slot[id] = slot;
+        mmc_regulator_get_supply(mmc);
         mmc_add_host(mmc);
 
         if (gpio_is_valid(slot->detect_pin)) {