| Message ID | 1594213888-2780-1-git-send-email-vbadigan@codeaurora.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [V1] mmc: sdhci-msm: Override DLL_CONFIG only if the valid value is supplied | expand |
On Wed, 8 Jul 2020 at 15:12, Veerabhadrarao Badiganti <vbadigan@codeaurora.org> wrote: > > During DLL initialization, the DLL_CONFIG register value would be > updated with the value supplied from the device-tree. > > Override this register only if a valid value is supplied. > > Fixes: 03591160ca19 ("mmc: sdhci-msm: Read and use DLL Config property from device tree file") > Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org> Applied for fixes, thanks! Kind regards Uffe > --- > drivers/mmc/host/sdhci-msm.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c > index efd2bae1430c..93d67a3a899f 100644 > --- a/drivers/mmc/host/sdhci-msm.c > +++ b/drivers/mmc/host/sdhci-msm.c > @@ -626,8 +626,9 @@ static int msm_init_cm_dll(struct sdhci_host *host) > config &= ~CORE_CLK_PWRSAVE; > writel_relaxed(config, host->ioaddr + msm_offset->core_vendor_spec); > > - config = msm_host->dll_config; > - writel_relaxed(config, host->ioaddr + msm_offset->core_dll_config); > + if (msm_host->dll_config) > + writel_relaxed(msm_host->dll_config, > + host->ioaddr + msm_offset->core_dll_config); > > if (msm_host->use_14lpp_dll_reset) { > config = readl_relaxed(host->ioaddr + > -- > Qualcomm India Private Limited, on behalf of Qualcomm Innovation Center, Inc., is a member of Code Aurora Forum, a Linux Foundation Collaborative Project >
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index efd2bae1430c..93d67a3a899f 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -626,8 +626,9 @@ static int msm_init_cm_dll(struct sdhci_host *host) config &= ~CORE_CLK_PWRSAVE; writel_relaxed(config, host->ioaddr + msm_offset->core_vendor_spec); - config = msm_host->dll_config; - writel_relaxed(config, host->ioaddr + msm_offset->core_dll_config); + if (msm_host->dll_config) + writel_relaxed(msm_host->dll_config, + host->ioaddr + msm_offset->core_dll_config); if (msm_host->use_14lpp_dll_reset) { config = readl_relaxed(host->ioaddr +
During DLL initialization, the DLL_CONFIG register value would be updated with the value supplied from the device-tree. Override this register only if a valid value is supplied. Fixes: 03591160ca19 ("mmc: sdhci-msm: Read and use DLL Config property from device tree file") Signed-off-by: Veerabhadrarao Badiganti <vbadigan@codeaurora.org> --- drivers/mmc/host/sdhci-msm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)