diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-02-28 06:19:51 -0500 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-02-28 06:19:51 -0500 |
| commit | 4d3d534e9fd596e6f70ee19c75f0cd9aa5be2588 (patch) | |
| tree | 5564e5314031a7749c61b0635de239ab93581516 /drivers/mmc | |
| parent | 099b648116090acf0c65c8df867aa1cb42476f3b (diff) | |
| parent | e30be063d6dbcc0f18b1eb25fa709fdef89201fb (diff) | |
Merge branch 'fixes' into next
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-esdhc-imx.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index a967d54cb29f..8dbbc1f62b70 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c | |||
| @@ -1171,11 +1171,12 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host) | |||
| 1171 | writel(readl(host->ioaddr + SDHCI_HOST_CONTROL) | 1171 | writel(readl(host->ioaddr + SDHCI_HOST_CONTROL) |
| 1172 | | ESDHC_BURST_LEN_EN_INCR, | 1172 | | ESDHC_BURST_LEN_EN_INCR, |
| 1173 | host->ioaddr + SDHCI_HOST_CONTROL); | 1173 | host->ioaddr + SDHCI_HOST_CONTROL); |
| 1174 | |||
| 1174 | /* | 1175 | /* |
| 1175 | * erratum ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL | 1176 | * erratum ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL |
| 1176 | * TO1.1, it's harmless for MX6SL | 1177 | * TO1.1, it's harmless for MX6SL |
| 1177 | */ | 1178 | */ |
| 1178 | writel(readl(host->ioaddr + 0x6c) | BIT(7), | 1179 | writel(readl(host->ioaddr + 0x6c) & ~BIT(7), |
| 1179 | host->ioaddr + 0x6c); | 1180 | host->ioaddr + 0x6c); |
| 1180 | 1181 | ||
| 1181 | /* disable DLL_CTRL delay line settings */ | 1182 | /* disable DLL_CTRL delay line settings */ |