diff options
| author | Dong Aisheng <aisheng.dong@freescale.com> | 2015-10-31 22:47:32 +0800 |
|---|---|---|
| committer | Dong Aisheng <aisheng.dong@freescale.com> | 2015-11-01 01:44:36 +0800 |
| commit | 504c39d92a2910aa68abc6a9579e924ab3fb6715 (patch) | |
| tree | 0ec30d9c0d904d972f9dc9bf10a6b30cde09ce8d | |
| parent | ac3349870e2e3c8ae9f91491117d911f80798d6a (diff) | |
MLK-11796-1 Revert "ENGR00289406-2 mmc: sdhci-esdhc-imx: add SDHCI_QUIRK2_NOSTD_TIMEOUT_COUNTER"
Revert the patch and use upstream version instead.
This reverts commit a9935446d897ff68167af82eca30b96fb96f0f7a.
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index e00db8ad13d6..6bb2697da745 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -990,11 +990,6 @@ static int esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs) return esdhc_change_pinstate(host, uhs); } -static unsigned int esdhc_get_max_timeout_counter(struct sdhci_host *host) -{ - return 1 << 28; -} - static struct sdhci_ops sdhci_esdhc_ops = { .read_l = esdhc_readl_le, .read_w = esdhc_readw_le, @@ -1166,9 +1161,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) writel(readl(host->ioaddr + SDHCI_HOST_CONTROL) | ESDHC_BURST_LEN_EN_INCR, host->ioaddr + SDHCI_HOST_CONTROL); - - host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN | - SDHCI_QUIRK2_NOSTD_TIMEOUT_COUNTER; + host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN; host->mmc->caps |= MMC_CAP_1_8V_DDR; /* @@ -1176,8 +1169,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) * TO1.1, it's harmless for MX6SL */ writel(readl(host->ioaddr + 0x6c) | BIT(7), host->ioaddr + 0x6c); - sdhci_esdhc_ops.get_max_timeout_counter = - esdhc_get_max_timeout_counter; } if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) |