summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorEric Bénard <eric@eukrea.com>2010-10-23 01:57:21 +0200
committerChris Ball <cjb@laptop.org>2010-11-07 17:52:20 -0500
commit37865fe91582582a6f6c00652f6a2b1ff71f8a78 (patch)
tree559b5dbbd9a804c3f65d9e84354af278e1db7e17 /drivers
parent5f619704d18b93869d045abc49e09cdba109b04b (diff)
downloadlinux-3.10-37865fe91582582a6f6c00652f6a2b1ff71f8a78.tar.gz
linux-3.10-37865fe91582582a6f6c00652f6a2b1ff71f8a78.tar.bz2
linux-3.10-37865fe91582582a6f6c00652f6a2b1ff71f8a78.zip
mmc: sdhci-esdhc-imx: fix timeout on i.MX's sdhci
This patch fixes timeout problems on i.MX's sdhci as suggested by Richard Zhu. Tested on: - i.MX257: not needed - i.MX357: needed - i.MX515: needed More details can be found here: http://lists.infradead.org/pipermail/linux-arm-kernel/2010-October/029748.html Signed-off-by: Eric Bénard <eric@eukrea.com> Tested-by: Shawn Guo <shawn.gsc@gmail.com> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 2e9cca19c90..28e63ef58d0 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -17,6 +17,7 @@
#include <linux/clk.h>
#include <linux/mmc/host.h>
#include <linux/mmc/sdhci-pltfm.h>
+#include <mach/hardware.h>
#include "sdhci.h"
#include "sdhci-pltfm.h"
#include "sdhci-esdhc.h"
@@ -112,6 +113,9 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd
clk_enable(clk);
pltfm_host->clk = clk;
+ if (cpu_is_mx35() || cpu_is_mx51())
+ host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
+
return 0;
}