Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ac6da26 authored by Dong Aisheng's avatar Dong Aisheng Committed by Ulf Hansson
Browse files

mmc: sdhci-esdhc-imx: fix strobe DLL lock wrong clock issue 



When enable DDR, the clock factor definition is changed.
e.g. original 200Mhz will become 100Mhz once MIX_CTRL_DDREN bit is set
So we need to update the clock setting then the strobe dll can lock
the correct clock rate.

Additionally we also need disable the clock before locking strobe dll.

Acked-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarDong Aisheng <aisheng.dong@nxp.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent da0295ff

drivers/mmc/host/sdhci-esdhc-imx.c

+7 −0
Original line number Diff line number Diff line
@@ -853,6 +853,11 @@ static void esdhc_set_strobe_dll(struct sdhci_host *host) 
	u32 v;



	if (host->mmc->actual_clock > ESDHC_STROBE_DLL_CLK_FREQ) {

		/* disable clock before enabling strobe dll */

		writel(readl(host->ioaddr + ESDHC_VENDOR_SPEC) &

		       ~ESDHC_VENDOR_SPEC_FRC_SDCLK_ON,

		       host->ioaddr + ESDHC_VENDOR_SPEC);



		/* force a reset on strobe dll */

		writel(ESDHC_STROBE_DLL_CTRL_RESET,

			host->ioaddr + ESDHC_STROBE_DLL_CTRL);
@@ -914,6 +919,8 @@ static void esdhc_set_uhs_signaling(struct sdhci_host *host, unsigned timing) 
		m |= ESDHC_MIX_CTRL_DDREN | ESDHC_MIX_CTRL_HS400_EN;

		writel(m, host->ioaddr + ESDHC_MIX_CTRL);

		imx_data->is_ddr = 1;

		/* update clock after enable DDR for strobe DLL lock */

		host->ops->set_clock(host, host->clock);

		esdhc_set_strobe_dll(host);

		break;

	}