mmc: implement SD-combo (IO+mem) support

Signed-off-by: Michal Miroslaw <mirq-linux@rere.qmqm.pl>
Cc: Adrian Hunter <adrian.hunter@nokia.com>
Cc: Chris Ball <cjb@laptop.org>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 569e94da844..b69ce91b11e 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1099,8 +1099,15 @@ void mmc_rescan(struct work_struct *work)
          */
         err = mmc_send_io_op_cond(host, 0, &ocr);
         if (!err) {
-                if (mmc_attach_sdio(host, ocr))
-                        mmc_power_off(host);
+                if (mmc_attach_sdio(host, ocr)) {
+                        mmc_claim_host(host);
+                        /* try SDMEM (but not MMC) even if SDIO is broken */
+                        if (mmc_send_app_op_cond(host, 0, &ocr))
+                                goto out_fail;
+
+                        if (mmc_attach_sd(host, ocr))
+                                mmc_power_off(host);
+                }
                 goto out;
         }
 
@@ -1124,6 +1131,7 @@ void mmc_rescan(struct work_struct *work)
                 goto out;
         }
 
+out_fail:
         mmc_release_host(host);
         mmc_power_off(host);