Skip to content
Snippets Groups Projects
Commit 4d3d534e authored by Ulf Hansson's avatar Ulf Hansson
Browse files

Merge branch 'fixes' into next

parents 099b6481 e30be063
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
drivers/mmc/host/sdhci-esdhc-imx.c
+ 5
− 4
View file @ 4d3d534e
...@@ -1171,11 +1171,12 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host) ...@@ -1171,11 +1171,12 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host)
writel(readl(host->ioaddr + SDHCI_HOST_CONTROL) writel(readl(host->ioaddr + SDHCI_HOST_CONTROL)
| ESDHC_BURST_LEN_EN_INCR, | ESDHC_BURST_LEN_EN_INCR,
host->ioaddr + SDHCI_HOST_CONTROL); host->ioaddr + SDHCI_HOST_CONTROL);
/* /*
* erratum ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL * erratum ESDHC_FLAG_ERR004536 fix for MX6Q TO1.2 and MX6DL
* TO1.1, it's harmless for MX6SL * TO1.1, it's harmless for MX6SL
*/ */
writel(readl(host->ioaddr + 0x6c) | BIT(7), writel(readl(host->ioaddr + 0x6c) & ~BIT(7),
host->ioaddr + 0x6c); host->ioaddr + 0x6c);
/* disable DLL_CTRL delay line settings */ /* disable DLL_CTRL delay line settings */
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment