Skip to content

L
linux
Commit 4d3d534e authored by Ulf Hansson's avatar Ulf Hansson
Browse files
Options

Merge branch 'fixes' into next

parents 099b6481 e30be063
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
drivers/mmc/host/sdhci-esdhc-imx.c
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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7