|
@@ -2456,25 +2456,6 @@ int sdhci_add_host(struct sdhci_host *host)
|
|
|
host->max_clk = host->ops->get_max_clock(host);
|
|
|
}
|
|
|
|
|
|
- host->timeout_clk =
|
|
|
- (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
|
|
|
- if (host->timeout_clk == 0) {
|
|
|
- if (host->ops->get_timeout_clock) {
|
|
|
- host->timeout_clk = host->ops->get_timeout_clock(host);
|
|
|
- } else if (!(host->quirks &
|
|
|
- SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
|
|
|
- printk(KERN_ERR
|
|
|
- "%s: Hardware doesn't specify timeout clock "
|
|
|
- "frequency.\n", mmc_hostname(mmc));
|
|
|
- return -ENODEV;
|
|
|
- }
|
|
|
- }
|
|
|
- if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
|
|
|
- host->timeout_clk *= 1000;
|
|
|
-
|
|
|
- if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
|
|
|
- host->timeout_clk = host->clock / 1000;
|
|
|
-
|
|
|
/*
|
|
|
* In case of Host Controller v3.00, find out whether clock
|
|
|
* multiplier is supported.
|
|
@@ -2507,6 +2488,25 @@ int sdhci_add_host(struct sdhci_host *host)
|
|
|
} else
|
|
|
mmc->f_min = host->max_clk / SDHCI_MAX_DIV_SPEC_200;
|
|
|
|
|
|
+ host->timeout_clk =
|
|
|
+ (caps[0] & SDHCI_TIMEOUT_CLK_MASK) >> SDHCI_TIMEOUT_CLK_SHIFT;
|
|
|
+ if (host->timeout_clk == 0) {
|
|
|
+ if (host->ops->get_timeout_clock) {
|
|
|
+ host->timeout_clk = host->ops->get_timeout_clock(host);
|
|
|
+ } else if (!(host->quirks &
|
|
|
+ SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)) {
|
|
|
+ printk(KERN_ERR
|
|
|
+ "%s: Hardware doesn't specify timeout clock "
|
|
|
+ "frequency.\n", mmc_hostname(mmc));
|
|
|
+ return -ENODEV;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (caps[0] & SDHCI_TIMEOUT_CLK_UNIT)
|
|
|
+ host->timeout_clk *= 1000;
|
|
|
+
|
|
|
+ if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
|
|
|
+ host->timeout_clk = host->clock / 1000;
|
|
|
+
|
|
|
if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK)
|
|
|
mmc->max_discard_to = (1 << 27) / (mmc->f_max / 1000);
|
|
|
else
|