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

Commit 3eef841c authored by Asutosh Das's avatar Asutosh Das
Browse files

Revert "mmc: sdhci-msm: Update DDR_CONFIG reg with HSR value if supplied" 



This reverts commit 99d7f96c.

This is a suspected change that's breaking suspend/resume in mainline.
Hence, revert this until the issue is fixed.

Change-Id: I6fbb06f2025c365ea3bd181a8d8fdb7a37f244b3
Signed-off-by: default avatarAsutosh Das <asutoshd@codeaurora.org>
parent 8ceaa4cf

drivers/mmc/host/sdhci-msm.c

+2 −8
Original line number Diff line number Diff line
@@ -1144,13 +1144,7 @@ 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;



	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);

	writel_relaxed(DDR_CONFIG_POR_VAL, host->ioaddr + ddr_cfg_offset);



	if (mmc->ios.enhanced_strobe) {

		config = readl_relaxed(host->ioaddr +
@@ -3466,7 +3460,7 @@ static __maybe_unused int sdhci_msm_runtime_resume(struct device *dev) 
}



static const struct dev_pm_ops sdhci_msm_pm_ops = {

	SET_LATE_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

	SET_RUNTIME_PM_OPS(sdhci_msm_runtime_suspend,

			   sdhci_msm_runtime_resume,