| Message ID | 20200611132839.4515-1-ludovic.barre@st.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 81a77ee9092dc819a7a53c18175fe907d55f7fef |
| Headers | show |
| Series | mmc: mmci: add sdio datactrl mask for sdmmc revisions | expand |
On Thu, 11 Jun 2020 at 15:28, Ludovic Barre <ludovic.barre@st.com> wrote: > > This patch adds datactrl_mask_sdio for sdmmc revisions. > sdmmc revisions used same bit of previous ST variant. > > Signed-off-by: Ludovic Barre <ludovic.barre@st.com> Applied for next, thanks! Kind regards Uffe > --- > drivers/mmc/host/mmci.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c > index a69d6a0c2e15..b5a41a7ce165 100644 > --- a/drivers/mmc/host/mmci.c > +++ b/drivers/mmc/host/mmci.c > @@ -267,6 +267,7 @@ static struct variant_data variant_stm32_sdmmc = { > .datalength_bits = 25, > .datactrl_blocksz = 14, > .datactrl_any_blocksz = true, > + .datactrl_mask_sdio = MCI_DPSM_ST_SDIOEN, > .stm32_idmabsize_mask = GENMASK(12, 5), > .busy_timeout = true, > .busy_detect = true, > @@ -292,6 +293,7 @@ static struct variant_data variant_stm32_sdmmcv2 = { > .datalength_bits = 25, > .datactrl_blocksz = 14, > .datactrl_any_blocksz = true, > + .datactrl_mask_sdio = MCI_DPSM_ST_SDIOEN, > .stm32_idmabsize_mask = GENMASK(16, 5), > .dma_lli = true, > .busy_timeout = true, > -- > 2.17.1 >
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index a69d6a0c2e15..b5a41a7ce165 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -267,6 +267,7 @@ static struct variant_data variant_stm32_sdmmc = { .datalength_bits = 25, .datactrl_blocksz = 14, .datactrl_any_blocksz = true, + .datactrl_mask_sdio = MCI_DPSM_ST_SDIOEN, .stm32_idmabsize_mask = GENMASK(12, 5), .busy_timeout = true, .busy_detect = true, @@ -292,6 +293,7 @@ static struct variant_data variant_stm32_sdmmcv2 = { .datalength_bits = 25, .datactrl_blocksz = 14, .datactrl_any_blocksz = true, + .datactrl_mask_sdio = MCI_DPSM_ST_SDIOEN, .stm32_idmabsize_mask = GENMASK(16, 5), .dma_lli = true, .busy_timeout = true,
This patch adds datactrl_mask_sdio for sdmmc revisions. sdmmc revisions used same bit of previous ST variant. Signed-off-by: Ludovic Barre <ludovic.barre@st.com> --- drivers/mmc/host/mmci.c | 2 ++ 1 file changed, 2 insertions(+)