1 files changed, 38 insertions, 10 deletions

diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index c86588fdaae5..d1c1e0f592f1 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -323,9 +323,21 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
                 goto err;
 
         /*
+         * For SPI, enable CRC as appropriate.
+         */
+        if (mmc_host_is_spi(host)) {
+                err = mmc_spi_set_crc(host, use_spi_crc);
+                if (err)
+                        goto err;
+        }
+
+        /*
          * Fetch CID from card.
          */
-        err = mmc_all_send_cid(host, cid);
+        if (mmc_host_is_spi(host))
+                err = mmc_send_cid(host, cid);
+        else
+                err = mmc_all_send_cid(host, cid);
         if (err)
                 goto err;
 
@@ -351,13 +363,15 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
         }
 
         /*
-         * Set card RCA.
+         * For native busses:  get card RCA and quit open drain mode.
          */
-        err = mmc_send_relative_addr(host, &card->rca);
-        if (err)
-                goto free_card;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_send_relative_addr(host, &card->rca);
+                if (err)
+                        goto free_card;
 
-        mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+                mmc_set_bus_mode(host, MMC_BUSMODE_PUSHPULL);
+        }
 
         if (!oldcard) {
                 /*
@@ -377,9 +391,11 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
         /*
          * Select card, as all following commands rely on that.
          */
-        err = mmc_select_card(card);
-        if (err)
-                goto free_card;
+        if (!mmc_host_is_spi(host)) {
+                err = mmc_select_card(card);
+                if (err)
+                        goto free_card;
+        }
 
         if (!oldcard) {
                 /*
@@ -562,7 +578,8 @@ static void mmc_sd_suspend(struct mmc_host *host)
         BUG_ON(!host->card);
 
         mmc_claim_host(host);
-        mmc_deselect_cards(host);
+        if (!mmc_host_is_spi(host))
+                mmc_deselect_cards(host);
         host->card->state &= ~MMC_STATE_HIGHSPEED;
         mmc_release_host(host);
 }
@@ -623,6 +640,17 @@ int mmc_attach_sd(struct mmc_host *host, u32 ocr)
         mmc_attach_bus(host, &mmc_sd_ops);
 
         /*
+         * We need to get OCR a different way for SPI.
+         */
+        if (mmc_host_is_spi(host)) {
+                mmc_go_idle(host);
+
+                err = mmc_spi_read_ocr(host, 0, &ocr);
+                if (err)
+                        goto err;
+        }
+
+        /*
          * Sanity check the voltages that the card claims to
          * support.
          */