Skip to content

Commit 3ec2d51

Browse files
Veerabhadrarao Badigantistorulf
authored andcommitted
mmc: sdhci-msm: Override DLL_CONFIG only if the valid value is supplied
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: 0359116 ("mmc: sdhci-msm: Read and use DLL Config property from device tree file") Signed-off-by: Veerabhadrarao Badiganti <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ulf Hansson <[email protected]>
1 parent f888471 commit 3ec2d51

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/mmc/host/sdhci-msm.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -618,8 +618,9 @@ static int msm_init_cm_dll(struct sdhci_host *host)
618618
config &= ~CORE_CLK_PWRSAVE;
619619
writel_relaxed(config, host->ioaddr + msm_offset->core_vendor_spec);
620620

621-
config = msm_host->dll_config;
622-
writel_relaxed(config, host->ioaddr + msm_offset->core_dll_config);
621+
if (msm_host->dll_config)
622+
writel_relaxed(msm_host->dll_config,
623+
host->ioaddr + msm_offset->core_dll_config);
623624

624625
if (msm_host->use_14lpp_dll_reset) {
625626
config = readl_relaxed(host->ioaddr +

0 commit comments

Comments
 (0)