[ 009/167] [PATCH] mmc: unbreak sdhci-esdhc-imx on i.MX25

Ben Hutchings
2012-05-09T05:52:47Z

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1185 bytes --]

3.2-stable review patch. If anyone has any objections, please let me know.

------------------

From: =?UTF-8?q?Eric=20B=C3=A9nard?= <eric@eukrea.com>

commit b89152824f993a9572b47eb31f4579feadeac34c upstream.

This was broken by me in 37865fe91582582a6f6c00652f6a2b1ff71f8a78
("mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci") where more
extensive tests would have shown that read or write of data to the
card were failing (even if the partition table was correctly read).

Signed-off-by: Eric Bénard <eric@eukrea.com>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
drivers/mmc/host/sdhci-esdhc-imx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

--- linux.orig/drivers/mmc/host/sdhci-esdhc-imx.c
+++ linux/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -467,8 +467,7 @@
clk_enable(clk);
pltfm_host->clk = clk;

- if (!is_imx25_esdhc(imx_data))
- host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+ host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;

if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data))
/* Fix errata ENGcm07207 present on i.MX25 and i.MX35 */