summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorPhilippe Schenker <philippe.schenker@toradex.com>2019-05-08 16:07:31 +0200
committerPhilippe Schenker <philippe.schenker@toradex.com>2019-05-08 16:07:31 +0200
commit95a0514c2e68a035e2adbdb5a297da310dccb09c (patch)
treea0e953cfc2cbd7b9e6e1cb33440ba0a77275a442 /drivers
parenta1764124242f973fafdcf66c5384c53b638786ea (diff)
Revert "MLK-20957-1 mmc: sdhci-esdhc-imx: correct the fix of ERR004536"
This reverts commit b2d44eb43568cadda6326c5e3b13ff018fdf1af0.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mmc/host/sdhci-esdhc-imx.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index e2061a08cf34..6b8dea469098 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -1201,6 +1201,12 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host)
writel(readl(host->ioaddr + SDHCI_HOST_CONTROL)
| ESDHC_BURST_LEN_EN_INCR,
host->ioaddr + SDHCI_HOST_CONTROL);
+ /*
+ * erratum ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL
+ * TO1.1, it's harmless for MX6SL
+ */
+ writel(readl(host->ioaddr + 0x6c) | BIT(7),
+ host->ioaddr + 0x6c);
/* disable DLL_CTRL delay line settings */
writel(0x0, host->ioaddr + ESDHC_DLL_CTRL);