summaryrefslogtreecommitdiff
path: root/drivers/mmc
diff options
context:
space:
mode:
authorXinyu Chen <xinyu.chen@freescale.com>2012-08-03 10:01:08 +0800
committerXinyu Chen <xinyu.chen@freescale.com>2012-08-03 10:01:08 +0800
commitb4c1ea277292614383f036c88554a296df64ecac (patch)
tree0364cb393667d361e369cd130dad018fd9396a6a /drivers/mmc
parent8e26c065b9999f7d6a6a3bd3aa3984fd1dbbe793 (diff)
parent76f691466a56fc235d4f4e138195dc78a5823c37 (diff)
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index f726354c4235..511d2abef93b 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -821,6 +821,13 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd
host->quirks |= SDHCI_QUIRK_NO_MULTIBLOCK
| SDHCI_QUIRK_BROKEN_ADMA;
+ /*
+ * on mx6dl TO 1.1, ADMA can work when ahb bus frequency is low,
+ * like 24Mhz.
+ */
+ if (mx6dl_revision() >= IMX_CHIP_REVISION_1_1)
+ host->quirks &= ~SDHCI_QUIRK_BROKEN_ADMA;
+
if (cpu_is_mx6())
host->quirks2 |= SDHCI_QUIRK_BROKEN_AUTO_CMD23,