2 files changed, 32 insertions, 6 deletions

diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index b0b6ce93e519..bd2755e8d9a3 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -63,13 +63,19 @@ static int sdio_init_func(struct mmc_card *card, unsigned int fn)
 
         func->num = fn;
 
-        ret = sdio_read_fbr(func);
-        if (ret)
-                goto fail;
+        if (!(card->quirks & MMC_QUIRK_NONSTD_SDIO)) {
+                ret = sdio_read_fbr(func);
+                if (ret)
+                        goto fail;
 
-        ret = sdio_read_func_cis(func);
-        if (ret)
-                goto fail;
+                ret = sdio_read_func_cis(func);
+                if (ret)
+                        goto fail;
+        } else {
+                func->vendor = func->card->cis.vendor;
+                func->device = func->card->cis.device;
+                func->max_blksize = func->card->cis.blksize;
+        }
 
         card->sdio_func[fn - 1] = func;
 
@@ -412,6 +418,23 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
                         goto remove;
         }
 
+        if (card->quirks & MMC_QUIRK_NONSTD_SDIO) {
+                /*
+                 * This is non-standard SDIO device, meaning it doesn't
+                 * have any CIA (Common I/O area) registers present.
+                 * It's host's responsibility to fill cccr and cis
+                 * structures in init_card().
+                 */
+                mmc_set_clock(host, card->cis.max_dtr);
+
+                if (card->cccr.high_speed) {
+                        mmc_card_set_highspeed(card);
+                        mmc_set_timing(card->host, MMC_TIMING_SD_HS);
+                }
+
+                goto finish;
+        }
+
         /*
          * Read the common registers.
          */
@@ -480,6 +503,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
         else if (err)
                 goto remove;
 
+finish:
         if (!oldcard)
                 host->card = card;
         return 0;
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index 340d391aecbb..4d893eaf8174 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -103,6 +103,8 @@ struct mmc_card {
 #define MMC_QUIRK_LENIENT_FN0   (1<<0)          /* allow SDIO FN0 writes outside of the VS CCCR range */
 #define MMC_QUIRK_BLKSZ_FOR_BYTE_MODE (1<<1)    /* use func->cur_blksize */
                                                 /* for byte mode */
+#define MMC_QUIRK_NONSTD_SDIO   (1<<2)          /* non-standard SDIO card attached */
+                                                /* (missing CIA registers) */
 
         u32                     raw_cid[4];     /* raw card CID */
         u32                     raw_csd[4];     /* raw card CSD */