mmc: msm_sdcc: Unconditionally send CMD52 after CMD53
Always send a dummy CMD52 after CMD53 for controllers
earlier than SDCC4
Signed-off-by: Oluwafemi Adeyemi <aadeyemi@codeaurora.org>
Conflicts:
arch/arm/configs/msm7627-perf_defconfig
arch/arm/configs/msm7627_defconfig
arch/arm/configs/qsd-chromeos-st1q-qrdc_defconfig
arch/arm/mach-msm/board-qrdc.c
chromeos/config/armel/config.flavour.chromeos-st1q-qrdc
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 7378c62..7c85974 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -476,15 +476,6 @@
help
Select Y to enable 8bit support for Slot 1.
-config MMC_MSM_SDC1_DUMMY52_REQUIRED
- boolean "Send dummy 52 read for SDC1"
- depends on MMC_MSM_SDC1_SUPPORT
- default n
- help
- Select Y to enable sending dummy 52 reads to complete
- all data commands. Required for some SDIO cards.
- If unsure, say N.
-
config MMC_MSM_SDC2_SUPPORT
boolean "Qualcomm SDC2 support"
depends on MMC_MSM
@@ -499,15 +490,6 @@
help
Select Y to enable 8bit support for Slot 2.
-config MMC_MSM_SDC2_DUMMY52_REQUIRED
- boolean "Send dummy 52 read for SDC2"
- depends on MMC_MSM_SDC2_SUPPORT
- default n
- help
- Select Y to enable sending dummy 52 reads to complete
- all data commands. Required for some SDIO cards.
- If unsure, say N.
-
config MMC_MSM_SDC3_SUPPORT
boolean "Qualcomm SDC3 support"
depends on MMC_MSM
@@ -522,15 +504,6 @@
help
Select Y to enable 8bit support for Slot 3.
-config MMC_MSM_SDC3_DUMMY52_REQUIRED
- boolean "Send dummy 52 read for SDC3"
- depends on MMC_MSM_SDC3_SUPPORT
- default n
- help
- Select Y to enable sending dummy 52 reads to complete
- all data commands. Required for some SDIO cards.
- If unsure, say N.
-
config MMC_MSM_SDC4_SUPPORT
boolean "Qualcomm SDC4 support"
depends on MMC_MSM
@@ -545,15 +518,6 @@
help
Select Y to enable 8bit support for Slot 4.
-config MMC_MSM_SDC4_DUMMY52_REQUIRED
- boolean "Send dummy 52 read for SDC4"
- depends on MMC_MSM_SDC4_SUPPORT
- default n
- help
- Select Y to enable sending dummy 52 reads to complete
- all data commands. Required for some SDIO cards.
- If unsure, say N.
-
config MMC_MSM_SDC5_SUPPORT
boolean "Qualcomm SDC5 support"
depends on MMC_MSM
@@ -568,15 +532,6 @@
help
Select Y to enable 8bit support for Slot 5.
-config MMC_MSM_SDC5_DUMMY52_REQUIRED
- boolean "Send dummy 52 read for SDC5"
- depends on MMC_MSM_SDC5_SUPPORT
- default n
- help
- Select Y to enable sending dummy 52 reads to complete
- all data commands. Required for some SDIO cards.
- If unsure, say N.
-
config MMC_MSM_SPS_SUPPORT
bool "Use SPS BAM as data mover"
depends on MMC_MSM && SPS
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c
index 92a3a39..453c6a0 100644
--- a/drivers/mmc/host/msm_sdcc.c
+++ b/drivers/mmc/host/msm_sdcc.c
@@ -1519,7 +1519,7 @@
host->curr.mrq = mrq;
- if (host->plat->dummy52_required) {
+ if (!host->plat->sdcc_v4_sup) {
if (mrq->data && mrq->data->flags == MMC_DATA_WRITE) {
if (mrq->cmd->opcode == SD_IO_RW_EXTENDED ||
mrq->cmd->opcode == 54) {