From: Ryan QIAN Date: Fri, 24 Feb 2012 08:48:53 +0000 (+0800) Subject: ENGR00175321 [MX6]MMCSD: eMMC4.4 failed to work after resume X-Git-Tag: v3.0.35-fsl~1414 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4dc8dfa32fabe006416611b97d06c1fbc7cf48a0;p=karo-tx-linux.git ENGR00175321 [MX6]MMCSD: eMMC4.4 failed to work after resume - clear ddr_en bit on non ddr timing mode in platform 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 dd2c8cc7edbb..95b416b9c1c7 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c @@ -324,8 +324,13 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg) orig_reg |= (val & SDHCI_CTRL_TUNED_CLK) ? 0 : SDHCI_MIX_CTRL_SMPCLK_SEL; - orig_reg |= (val & SDHCI_CTRL_UHS_DDR50) - ? SDHCI_MIX_CTRL_DDREN : 0; + if (val & SDHCI_CTRL_UHS_DDR50) { + orig_reg |= SDHCI_MIX_CTRL_DDREN; + imx_data->scratchpad |= SDHCI_MIX_CTRL_DDREN; + } else { + orig_reg &= ~SDHCI_MIX_CTRL_DDREN; + imx_data->scratchpad &= ~SDHCI_MIX_CTRL_DDREN; + } writel(orig_reg, host->ioaddr + SDHCI_MIX_CTRL); /* set clock frequency again */ @@ -537,8 +542,6 @@ static int plt_8bit_width(struct sdhci_host *host, int width) reg |= SDHCI_PROT_CTRL_8BIT; else if (width == MMC_BUS_WIDTH_4) reg |= SDHCI_PROT_CTRL_4BIT; - else if (width == MMC_BUS_WIDTH_1) - host->mmc->ios.ddr = 0; writel(reg, host->ioaddr + SDHCI_HOST_CONTROL); return 0;