mmc: sdhci: Add new quirks for SUPPORT_SINGLE

This patch defines a quirk to disable the block count
for single block transactions.

This is similar to Linux kernel commit d3fc5d71ac4d
("mmc: sdhci: add a quirk for single block transactions").

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c
index bf989a594f7e38c85262b9a56d6e4a8ceb592871..a80ad8329a38c38a7630af7be7173b46fd037e10 100644 (file)
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/sdhci.c
@@ -211,7 +211,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
        unsigned int stat = 0;
        int ret = 0;
        int trans_bytes = 0, is_aligned = 1;
-       u32 mask, flags, mode;
+       u32 mask, flags, mode = 0;
        unsigned int time = 0;
        int mmc_dev = mmc_get_blk_desc(mmc)->devnum;
        ulong start = get_timer(0);
@@ -273,10 +273,12 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
        /* Set Transfer mode regarding to data flag */
        if (data) {
                sdhci_writeb(host, 0xe, SDHCI_TIMEOUT_CONTROL);
-               mode = SDHCI_TRNS_BLK_CNT_EN;
+
+               if (!(host->quirks & SDHCI_QUIRK_SUPPORT_SINGLE))
+                       mode = SDHCI_TRNS_BLK_CNT_EN;
                trans_bytes = data->blocks * data->blocksize;
                if (data->blocks > 1)
-                       mode |= SDHCI_TRNS_MULTI;
+                       mode |= SDHCI_TRNS_MULTI | SDHCI_TRNS_BLK_CNT_EN;
 
                if (data->flags == MMC_DATA_READ)
                        mode |= SDHCI_TRNS_READ;

diff --git a/include/sdhci.h b/include/sdhci.h
index 88f1917480b66e85ef4015cc6ce6a008be150235..24b4599b857d217ad12963a8107bb610423075b4 100644 (file)
--- a/include/sdhci.h
+++ b/include/sdhci.h
@@ -247,6 +247,7 @@
 #define SDHCI_QUIRK_WAIT_SEND_CMD      (1 << 6)
 #define SDHCI_QUIRK_USE_WIDE8          (1 << 8)
 #define SDHCI_QUIRK_NO_1_8_V           (1 << 9)
+#define SDHCI_QUIRK_SUPPORT_SINGLE     (1 << 10)
 
 /* to make gcc happy */
 struct sdhci_host;