From 20f3b4c8bcfdbf1598c9a66fa6deeab7acf90ea8 Mon Sep 17 00:00:00 2001 From: Veerabhadrarao Badiganti Date: Fri, 10 Jul 2020 20:00:35 +0530 Subject: [PATCH] mmc: sdhci-msm: Update DDR_CONFIG reg with HSR value if supplied Update DDR_CONFIG register with HSR value if HSR value is supplied in the device tree. Change-Id: Ia811eaf48b4ef6af39dc882ac498bf88436e2f4b Signed-off-by: Veerabhadrarao Badiganti Signed-off-by: Sarthak Garg --- drivers/mmc/host/sdhci-msm.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index 9701cdee9ed8..c972e64e90d9 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1198,7 +1198,13 @@ static int sdhci_msm_cm_dll_sdc4_calibration(struct sdhci_host *host) ddr_cfg_offset = msm_offset->core_ddr_config; else ddr_cfg_offset = msm_offset->core_ddr_config_old; - writel_relaxed(DDR_CONFIG_POR_VAL, host->ioaddr + ddr_cfg_offset); + + if (msm_host->dll_hsr->ddr_config) + config = msm_host->dll_hsr->ddr_config; + else + config = DDR_CONFIG_POR_VAL; + + writel_relaxed(config, host->ioaddr + ddr_cfg_offset); if (mmc->ios.enhanced_strobe) { config = readl_relaxed(host->ioaddr +