2 files changed, 7 insertions, 3 deletions

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index a3ecd20e5510..c9881ca131d5 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -904,7 +904,7 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
 static void sdhci_set_transfer_mode(struct sdhci_host *host,
         struct mmc_command *cmd)
 {
-        u16 mode;
+        u16 mode = 0;
         struct mmc_data *data = cmd->data;
 
         if (data == NULL) {
@@ -922,9 +922,11 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
 
         WARN_ON(!host->data);
 
-        mode = SDHCI_TRNS_BLK_CNT_EN;
+        if (!(host->quirks2 & SDHCI_QUIRK2_SUPPORT_SINGLE))
+                mode = SDHCI_TRNS_BLK_CNT_EN;
+
         if (mmc_op_multi(cmd->opcode) || data->blocks > 1) {
-                mode |= SDHCI_TRNS_MULTI;
+                mode = SDHCI_TRNS_BLK_CNT_EN | SDHCI_TRNS_MULTI;
                 /*
                  * If we are sending CMD23, CMD12 never gets sent
                  * on successful completion (so no Auto-CMD12).
diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h
index 933b897ca095..c3e3db196738 100644
--- a/include/linux/mmc/sdhci.h
+++ b/include/linux/mmc/sdhci.h
@@ -113,6 +113,8 @@ struct sdhci_host {
 #define SDHCI_QUIRK2_CAPS_BIT63_FOR_HS400               (1<<11)
 /* forced tuned clock */
 #define SDHCI_QUIRK2_TUNING_WORK_AROUND                 (1<<12)
+/* disable the block count for single block transactions */
+#define SDHCI_QUIRK2_SUPPORT_SINGLE                     (1<<13)
 
         int irq;                /* Device IRQ */
         void __iomem *ioaddr;   /* Mapped address */