Commit b79220b3 authored by Ludovic Barre's avatar Ludovic Barre Committed by Ulf Hansson
Browse files

mmc: mmci: add variant property to not read datacnt 



This patch adds a boolean property to not read datacnt register.
Needed to support the STM32 sdmmc variant. MMCIDATACNT
register should be read only after the data transfer is completed.
When reading after an error event the read data count value may be
different from the real number of data bytes transferred.

Signed-off-by: default avatarLudovic Barre <ludovic.barre@st.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent d2141547

drivers/mmc/host/mmci.c

+6 −2
Original line number Diff line number Diff line
@@ -1123,8 +1123,12 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, 
		 * can be as much as a FIFO-worth of data ahead.  This

		 * matters for FIFO overruns only.

		 */

		if (!host->variant->datacnt_useless) {

			remain = readl(host->base + MMCIDATACNT);

			success = data->blksz * data->blocks - remain;

		} else {

			success = 0;

		}



		dev_dbg(mmc_dev(host->mmc), "MCI ERROR IRQ, status 0x%08x at 0x%08x\n",

			status_err, success);

drivers/mmc/host/mmci.h

+3 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ struct mmci_host; 
 * @datactrl_blksz: block size in power of two

 * @datactrl_dpsm_enable: enable value for DPSM

 * @datactrl_first: true if data must be setup before send command

 * @datacnt_useless: true if you could not use datacnt register to read

 *		     remaining data

 * @pwrreg_powerup: power up value for MMCIPOWER register

 * @f_max: maximum clk frequency supported by the controller.

 * @signal_direction: input/out direction of bus signals can be indicated
@@ -264,6 +266,7 @@ struct variant_data { 
	unsigned int		datactrl_blocksz;

	unsigned int		datactrl_dpsm_enable;

	u8			datactrl_first:1;

	u8			datacnt_useless:1;

	u8			st_sdio:1;

	u8			st_clkdiv:1;

	u8			blksz_datactrl16:1;

CRA Git | Maintained and supported by SUSTech CRA and CCSE