diff options
| author | Dong Aisheng <aisheng.dong@freescale.com> | 2015-10-31 22:48:27 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@freescale.com> | 2015-11-01 01:36:32 +0800 |
| commit | f3b7d5f8f2c2185fe7de772d17702dbcc7769232 (patch) | |
| tree | d5d075dca5e40e3b448bfe42ade87e21caf11e42 | |
| parent | 0a239c2694e5761a8ce4e4889edaaeddece52e6c (diff) | |
| download | freescale-f3b7d5f8f2c2185fe7de772d17702dbcc7769232.tar.gz | |
MLK-11796-2 Revert "ENGR00289406-1 mmc: sdhci: add quirk for get max timeout counter"
Revert the patch and using upstream version instead.
This reverts commit 056ef389fba70e2de8d1c5d976a1c1bd0578d381.
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 14 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.h | 1 | ||||
| -rw-r--r-- | include/linux/mmc/sdhci.h | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 7a879289302..c04538a431c 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -3044,19 +3044,7 @@ int sdhci_add_host(struct sdhci_host *host) if (host->quirks & SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK) host->timeout_clk = mmc->f_max / 1000; - if (host->quirks2 & SDHCI_QUIRK2_NOSTD_TIMEOUT_COUNTER) { - if (host->ops->get_max_timeout_counter) { - mmc->max_discard_to = - host->ops->get_max_timeout_counter(host) - / host->timeout_clk; - } else { - pr_err("%s: Hardware doesn't specify max timeout " - "counter\n", mmc_hostname(mmc)); - return -ENODEV; - } - } else { - mmc->max_discard_to = (1 << 27) / host->timeout_clk; - } + mmc->max_discard_to = (1 << 27) / host->timeout_clk; mmc->caps |= MMC_CAP_SDIO_IRQ | MMC_CAP_ERASE | MMC_CAP_CMD23; diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 4d38c29892b..399f5b7a5b0 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h @@ -290,7 +290,6 @@ struct sdhci_ops { unsigned int (*get_max_clock)(struct sdhci_host *host); unsigned int (*get_min_clock)(struct sdhci_host *host); unsigned int (*get_timeout_clock)(struct sdhci_host *host); - unsigned int (*get_max_timeout_counter)(struct sdhci_host *host); int (*platform_bus_width)(struct sdhci_host *host, int width); void (*platform_send_init_74_clocks)(struct sdhci_host *host, diff --git a/include/linux/mmc/sdhci.h b/include/linux/mmc/sdhci.h index d8a6ed9e14b..5d44a8819a1 100644 --- a/include/linux/mmc/sdhci.h +++ b/include/linux/mmc/sdhci.h @@ -101,7 +101,6 @@ struct sdhci_host { #define SDHCI_QUIRK2_NO_1_8_V (1<<2) #define SDHCI_QUIRK2_PRESET_VALUE_BROKEN (1<<3) #define SDHCI_QUIRK2_CARD_ON_NEEDS_BUS_ON (1<<4) -#define SDHCI_QUIRK2_NOSTD_TIMEOUT_COUNTER (1<<5) /* Controller has a non-standard host control register */ #define SDHCI_QUIRK2_BROKEN_HOST_CONTROL (1<<5) /* Controller does not support HS200 */ |