On 14 August 2014 16:03, Matthieu CASTET <matthieu.castet@xxxxxxxxxx> wrote:
> when SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK is set, timeout_clk is sdclk.
> We need to update it when we change sdclk in sdhci_set_clock.
> This allow to have a more precisse timeout and max_busy_timeout. This
> can help for command that need a big busy wait (erase, ...).
>
> Signed-off-by: Matthieu CASTET <matthieu.castet@xxxxxxxxxx>
Thanks! Applied for next.
This one didn't pass checkpatch, but I fixed it this time.
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci.c | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 9df59a4..76b1aab 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1192,8 +1192,13 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock)
> }
>
> clock_set:
> - if (real_div)
> + if (real_div) {
> host->mmc->actual_clock = (host->max_clk * clk_mul) / real_div;
> + if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) {
> + host->timeout_clk = host->mmc->actual_clock / 1000;
> + host->mmc->max_busy_timeout = (1 << 27) / host->timeout_clk;
> + }
> + }
>
> clk |= (div & SDHCI_DIV_MASK) << SDHCI_DIVIDER_SHIFT;
> clk |= ((div & SDHCI_DIV_HI_MASK) >> SDHCI_DIV_MASK_LEN)
> --
> 2.1.0.rc1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
