From: Ryan QIAN Date: Wed, 22 Feb 2012 01:32:51 +0000 (+0800) Subject: ENGR00175080 [MX6] MMC: kernel failed to init eMMC card, after boot from eMMC X-Git-Tag: v3.0.35-fsl_4.1.0~1589 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=796a8b000dfe106230ffc0e1a07aab789ac111b7;p=karo-tx-linux.git ENGR00175080 [MX6] MMC: kernel failed to init eMMC card, after boot from eMMC issue: if uboot is loaded from eMMC, the eMMC memory will be configured to DDR mode. on kernel startup, it will initialize the card at SDR mode, while the register of USDHC is still configured to DDR enable mode. Therefore, the initialization of eMMC memory will fail. fix: - clear MIX_CTRL on sdhc platform init code. - clear vselect bit of VENDOR_SPEC on sdhc platform init code. Signed-off-by: Ryan QIAN --- diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index 90c4b20f4f58..89c57359b8a5 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -630,7 +630,10 @@ static int esdhc_pltfm_init(struct sdhci_host *host, struct sdhci_pltfm_data *pd host->clk_mgr_en = true; } - reg = readl(host->ioaddr + SDHCI_MIX_CTRL); + writel(0, host->ioaddr + SDHCI_MIX_CTRL); + reg = readl(host->ioaddr + SDHCI_VENDOR_SPEC); + reg &= ~SDHCI_VENDOR_SPEC_VSELECT; + writel(reg, host->ioaddr + SDHCI_VENDOR_SPEC); /* disable card interrupt enable bit, and clear status bit * the default value of this enable bit is 1, but it should * be 0 regarding to standard host controller spec 2.1.3.