diff options
| author | Adrian Hunter <adrian.hunter@intel.com> | 2011-06-28 17:16:03 +0300 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-07-20 17:21:04 -0400 |
| commit | 58d1246db340793c408b22884598e4ce4d1d4aba (patch) | |
| tree | ce9b1cfa220d0b18e48c69f2cf7fb400ef7cc5e4 /drivers/mmc | |
| parent | e056a1b5b67b4e4bfad00bf143ab14f634777705 (diff) | |
| download | linux-3.10-58d1246db340793c408b22884598e4ce4d1d4aba.tar.gz linux-3.10-58d1246db340793c408b22884598e4ce4d1d4aba.tar.bz2 linux-3.10-58d1246db340793c408b22884598e4ce4d1d4aba.zip | |
mmc: sdhci: specify maximum discard timeout
In general, SDHC hardware timeout cannot be avoided.
Accordingly, the maximum timeout is specified to limit
the maximum discard size.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index aa25eae6540..c31a3343340 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -2509,6 +2509,11 @@ int sdhci_add_host(struct sdhci_host *host) } else mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200; + if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) + mmc->max_discard_to = (1 << 27) / (mmc->f_max / 1000); + else + mmc->max_discard_to = (1 << 27) / host->timeout_clk; + mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23; if (host->quirks & SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12) |