Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b45e668a authored by Aisheng Dong's avatar Aisheng Dong Committed by Ulf Hansson
Browse files

mmc: sdhci: add platform set_timeout hook 



Currently the common code assume 0xE is the maximum timeout counter
value and use it to write into the timeout counter register.
However, it's fairly possible that some other SoCs may have different
max timeout register value. That means 0xE may be incorrect and
becomes meaningless.

It's also possible that other platforms has different timeout
calculation algorithm. To be flexible, this patch provides a .set_timeout
hook for those platforms to set the timeout on their way if they need.

Reviewed-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarDong Aisheng <b29396@freescale.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 10fd0ad9

drivers/mmc/host/sdhci.c

+14 −5
Original line number Diff line number Diff line
@@ -707,19 +707,28 @@ static void sdhci_set_transfer_irqs(struct sdhci_host *host) 
	sdhci_writel(host, host->ier, SDHCI_SIGNAL_ENABLE);

}



static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)

static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)

{

	u8 count;



	if (host->ops->set_timeout) {

		host->ops->set_timeout(host, cmd);

	} else {

		count = sdhci_calc_timeout(host, cmd);

		sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);

	}

}



static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)

{

	u8 ctrl;

	struct mmc_data *data = cmd->data;

	int ret;



	WARN_ON(host->data);



	if (data || (cmd->flags & MMC_RSP_BUSY)) {

		count = sdhci_calc_timeout(host, cmd);

		sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);

	}

	if (data || (cmd->flags & MMC_RSP_BUSY))

		sdhci_set_timeout(host, cmd);



	if (!data)

		return;

drivers/mmc/host/sdhci.h

+2 −0
Original line number Diff line number Diff line
@@ -282,6 +282,8 @@ struct sdhci_ops { 
	unsigned int	(*get_min_clock)(struct sdhci_host *host);

	unsigned int	(*get_timeout_clock)(struct sdhci_host *host);

	unsigned int	(*get_max_timeout_count)(struct sdhci_host *host);

	void		(*set_timeout)(struct sdhci_host *host,

				       struct mmc_command *cmd);

	void		(*set_bus_width)(struct sdhci_host *host, int width);

	void (*platform_send_init_74_clocks)(struct sdhci_host *host,

					     u8 power_mode);