Skip to content

Commit 87a8622

Browse files
cyndisgregkh
authored andcommitted
memory: tegra30-emc: Fix dll_change check
[ Upstream commit 0a93f23 ] The code checking whether the specified memory timing enables DLL in the EMRS register was reversed. DLL is enabled if bit A0 is low. Fix the check. Fixes: e34212c ("memory: tegra: Introduce Tegra30 EMC driver") Signed-off-by: Mikko Perttunen <mperttunen@nvidia.com> Link: https://patch.msgid.link/20260126-fix-emc-dllchange-v1-2-47ad3bb63262@nvidia.com Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 1ebbbef commit 87a8622

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

drivers/memory/tegra/tegra30-emc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -554,14 +554,14 @@ static int emc_prepare_timing_change(struct tegra_emc *emc, unsigned long rate)
554554
emc->emc_cfg = readl_relaxed(emc->regs + EMC_CFG);
555555
emc_dbg = readl_relaxed(emc->regs + EMC_DBG);
556556

557-
if (emc->dll_on == !!(timing->emc_mode_1 & 0x1))
557+
if (emc->dll_on == !(timing->emc_mode_1 & 0x1))
558558
dll_change = DLL_CHANGE_NONE;
559-
else if (timing->emc_mode_1 & 0x1)
559+
else if (!(timing->emc_mode_1 & 0x1))
560560
dll_change = DLL_CHANGE_ON;
561561
else
562562
dll_change = DLL_CHANGE_OFF;
563563

564-
emc->dll_on = !!(timing->emc_mode_1 & 0x1);
564+
emc->dll_on = !(timing->emc_mode_1 & 0x1);
565565

566566
if (timing->data[80] && !readl_relaxed(emc->regs + EMC_ZCAL_INTERVAL))
567567
emc->zcal_long = true;

0 commit comments

Comments
 (0)