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

mmc: mmci: add variant property to write datactrl before command 



This patch adds a boolean property to allow to write datactrl
before to send command, whatever the command type (read or write).
Needed to support the STM32 sdmmc variant.

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

drivers/mmc/host/mmci.c

+4 −2
Original line number Diff line number Diff line
@@ -1267,7 +1267,8 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd, 
		mmci_request_end(host, host->mrq);

	} else if (sbc) {

		mmci_start_command(host, host->mrq->cmd, 0);

	} else if (!(cmd->data->flags & MMC_DATA_READ)) {

	} else if (!host->variant->datactrl_first &&

		   !(cmd->data->flags & MMC_DATA_READ)) {

		mmci_start_data(host, cmd->data);

	}

}
@@ -1531,7 +1532,8 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq) 
	if (mrq->data)

		mmci_get_next_data(host, mrq->data);



	if (mrq->data && mrq->data->flags & MMC_DATA_READ)

	if (mrq->data &&

	    (host->variant->datactrl_first || mrq->data->flags & MMC_DATA_READ))

		mmci_start_data(host, mrq->data);



	if (mrq->sbc)

drivers/mmc/host/mmci.h

+2 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ struct mmci_host; 
 * @datactrl_mask_sdio: SDIO enable mask in datactrl register

 * @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

 * @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
@@ -262,6 +263,7 @@ struct variant_data { 
	unsigned int		datactrl_mask_sdio;

	unsigned int		datactrl_blocksz;

	unsigned int		datactrl_dpsm_enable;

	u8			datactrl_first:1;

	u8			st_sdio:1;

	u8			st_clkdiv:1;

	u8			blksz_datactrl16:1;