hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fixes' into next

This commit is contained in:
Ulf Hansson 2019-02-28 12:19:51 +01:00
parent 099b648116 e30be063d6
commit 4d3d534e9f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/host/sdhci-esdhc-imx.c
View File

@ -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 */