Merge "mmc: sdhci-msm: Avoid overiding of vendor_specific_func register"

This commit is contained in:
qctecmdr 2021-08-06 07:59:44 -07:00 • committed by Gerrit - the friendly Code Review server
commit c4bb61e257

View file

@ -1500,9 +1500,6 @@ static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)
const struct sdhci_msm_offset *msm_offset =
sdhci_priv_msm_offset(host);
core_vendor_spec = readl_relaxed(host->ioaddr +
msm_offset->core_vendor_spec);
if (!sdhci_msm_is_tuning_needed(host)) {
msm_host->use_cdr = false;
sdhci_msm_set_cdr(host, false);
@ -1529,6 +1526,9 @@ static int sdhci_msm_execute_tuning(struct mmc_host *mmc, u32 opcode)
host->flags &= ~SDHCI_HS400_TUNING;
}
core_vendor_spec = readl_relaxed(host->ioaddr +
msm_offset->core_vendor_spec);
/* Make sure that PWRSAVE bit is set to '0' during tuning */
writel_relaxed((core_vendor_spec & ~CORE_CLK_PWRSAVE),
host->ioaddr +