From cccfa88f2c101e5f7dd2b91547525d7ce44174ce Mon Sep 17 00:00:00 2001 From: Asutosh Das Date: Sun, 26 Jul 2020 08:24:20 -0700 Subject: [PATCH] Revert "UPSTREAM: mmc: sdhci-msm: Don't enable PWRSAVE_DLL for certain sdhc hosts" This reverts commit dfc165dfbdfcf7cc95cb902c314e1478abe79ca9. This is a suspected change that's breaking suspend/resume in mainline. Hence, revert this until the issue is fixed. Change-Id: Ia92d64ba3121e01770b680478af1c2a65b49f48c Signed-off-by: Asutosh Das --- drivers/mmc/host/sdhci-msm.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index a03b070d8d5a..82a0788795b9 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -1169,21 +1169,9 @@ static int sdhci_msm_cm_dll_sdc4_calibration(struct sdhci_host *host) goto out; } - /* - * Set CORE_PWRSAVE_DLL bit in CORE_VENDOR_SPEC3. - * When MCLK is gated OFF, it is not gated for less than 0.5us - * and MCLK must be switched on for at-least 1us before DATA - * starts coming. Controllers with 14lpp and later tech DLL cannot - * guarantee above requirement. So PWRSAVE_DLL should not be - * turned on for host controllers using this DLL. - */ - if (!msm_host->use_14lpp_dll_reset) { - config = readl_relaxed(host->ioaddr + - msm_offset->core_vendor_spec3); - config |= CORE_PWRSAVE_DLL; - writel_relaxed(config, host->ioaddr + - msm_offset->core_vendor_spec3); - } + config = readl_relaxed(host->ioaddr + msm_offset->core_vendor_spec3); + config |= CORE_PWRSAVE_DLL; + writel_relaxed(config, host->ioaddr + msm_offset->core_vendor_spec3); /* * Drain writebuffer to ensure above DLL calibration