mmc: sdhci-msm: Correct the CDR toggle logic
We should keep either one of CDR_EN or CDR_EXT_EN enabled.
So correct this logic in toggle CDR function.
CRs-fixed: 759398
Change-Id: Ic137ae2a28e912ab131644ff9d81e41f4256dd05
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
Signed-off-by: Pavan Anamula <pavana@codeaurora.org>
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c
index af4c644..e4c5ada 100644
--- a/drivers/mmc/host/sdhci-msm.c
+++ b/drivers/mmc/host/sdhci-msm.c
@@ -2347,14 +2347,17 @@
static void sdhci_msm_toggle_cdr(struct sdhci_host *host, bool enable)
{
- if (enable)
- writel_relaxed((readl_relaxed(host->ioaddr +
- CORE_DLL_CONFIG) | CORE_CDR_EN),
- host->ioaddr + CORE_DLL_CONFIG);
- else
- writel_relaxed((readl_relaxed(host->ioaddr +
- CORE_DLL_CONFIG) & ~CORE_CDR_EN),
- host->ioaddr + CORE_DLL_CONFIG);
+ u32 config = readl_relaxed(host->ioaddr + CORE_DLL_CONFIG);
+
+ if (enable) {
+ config |= CORE_CDR_EN;
+ config &= ~CORE_CDR_EXT_EN;
+ writel_relaxed(config, host->ioaddr + CORE_DLL_CONFIG);
+ } else {
+ config &= ~CORE_CDR_EN;
+ config |= CORE_CDR_EXT_EN;
+ writel_relaxed(config, host->ioaddr + CORE_DLL_CONFIG);
+ }
}
static unsigned int sdhci_msm_max_segs(void)