aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc/host/mmci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mmc/host/mmci.c')
-rw-r--r--drivers/mmc/host/mmci.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 13fa640d86d6..e352f5ad5801 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -21,6 +21,7 @@
21#include <linux/err.h> 21#include <linux/err.h>
22#include <linux/highmem.h> 22#include <linux/highmem.h>
23#include <linux/log2.h> 23#include <linux/log2.h>
24#include <linux/mmc/mmc.h>
24#include <linux/mmc/pm.h> 25#include <linux/mmc/pm.h>
25#include <linux/mmc/host.h> 26#include <linux/mmc/host.h>
26#include <linux/mmc/card.h> 27#include <linux/mmc/card.h>
@@ -274,6 +275,7 @@ static struct variant_data variant_stm32_sdmmc = {
274 .cmdreg_lrsp_crc = MCI_CPSM_STM32_LRSP_CRC, 275 .cmdreg_lrsp_crc = MCI_CPSM_STM32_LRSP_CRC,
275 .cmdreg_srsp_crc = MCI_CPSM_STM32_SRSP_CRC, 276 .cmdreg_srsp_crc = MCI_CPSM_STM32_SRSP_CRC,
276 .cmdreg_srsp = MCI_CPSM_STM32_SRSP, 277 .cmdreg_srsp = MCI_CPSM_STM32_SRSP,
278 .cmdreg_stop = MCI_CPSM_STM32_CMDSTOP,
277 .data_cmd_enable = MCI_CPSM_STM32_CMDTRANS, 279 .data_cmd_enable = MCI_CPSM_STM32_CMDTRANS,
278 .irq_pio_mask = MCI_IRQ_PIO_STM32_MASK, 280 .irq_pio_mask = MCI_IRQ_PIO_STM32_MASK,
279 .datactrl_first = true, 281 .datactrl_first = true,
@@ -1100,6 +1102,10 @@ mmci_start_command(struct mmci_host *host, struct mmc_command *cmd, u32 c)
1100 mmci_reg_delay(host); 1102 mmci_reg_delay(host);
1101 } 1103 }
1102 1104
1105 if (host->variant->cmdreg_stop &&
1106 cmd->opcode == MMC_STOP_TRANSMISSION)
1107 c |= host->variant->cmdreg_stop;
1108
1103 c |= cmd->opcode | host->variant->cmdreg_cpsm_enable; 1109 c |= cmd->opcode | host->variant->cmdreg_cpsm_enable;
1104 if (cmd->flags & MMC_RSP_PRESENT) { 1110 if (cmd->flags & MMC_RSP_PRESENT) {
1105 if (cmd->flags & MMC_RSP_136) 1111 if (cmd->flags & MMC_RSP_136)