mmc: mmci: Add support for sdmmc variant revision 2.0

This patch adds a sdmmc variant revision 2.0. This revision is backward
compatible with 1.1, but adds DMA linked list support.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Link: https://lore.kernel.org/r/20200128090636.13689-10-ludovic.barre@st.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 24e630183ed4da561e605824355bc6c6f5c0f2ee..647567def6125789947c1aa432c82ba7019ac7d2 100644 (file)
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -275,6 +275,32 @@ static struct variant_data variant_stm32_sdmmc = {
        .init                   = sdmmc_variant_init,
 };
 
+static struct variant_data variant_stm32_sdmmcv2 = {
+       .fifosize               = 16 * 4,
+       .fifohalfsize           = 8 * 4,
+       .f_max                  = 208000000,
+       .stm32_clkdiv           = true,
+       .cmdreg_cpsm_enable     = MCI_CPSM_STM32_ENABLE,
+       .cmdreg_lrsp_crc        = MCI_CPSM_STM32_LRSP_CRC,
+       .cmdreg_srsp_crc        = MCI_CPSM_STM32_SRSP_CRC,
+       .cmdreg_srsp            = MCI_CPSM_STM32_SRSP,
+       .cmdreg_stop            = MCI_CPSM_STM32_CMDSTOP,
+       .data_cmd_enable        = MCI_CPSM_STM32_CMDTRANS,
+       .irq_pio_mask           = MCI_IRQ_PIO_STM32_MASK,
+       .datactrl_first         = true,
+       .datacnt_useless        = true,
+       .datalength_bits        = 25,
+       .datactrl_blocksz       = 14,
+       .datactrl_any_blocksz   = true,
+       .stm32_idmabsize_mask   = GENMASK(16, 5),
+       .dma_lli                = true,
+       .busy_timeout           = true,
+       .busy_detect            = true,
+       .busy_detect_flag       = MCI_STM32_BUSYD0,
+       .busy_detect_mask       = MCI_STM32_BUSYD0ENDMASK,
+       .init                   = sdmmc_variant_init,
+};
+
 static struct variant_data variant_qcom = {
        .fifosize               = 16 * 4,
        .fifohalfsize           = 8 * 4,
@@ -2343,6 +2369,11 @@ static const struct amba_id mmci_ids[] = {
                .mask   = 0xf0ffffff,
                .data   = &variant_stm32_sdmmc,
        },
+       {
+               .id     = 0x00253180,
+               .mask   = 0xf0ffffff,
+               .data   = &variant_stm32_sdmmcv2,
+       },
        /* Qualcomm variants */
        {
                .id     = 0x00051180,