Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: tegra: divider: Check UART's divider enable-bit state on rate's recalculation

UART clock is divided using divisor values from DLM/DLL registers when
enable-bit is unset in clk register and clk's divider configuration isn't
taken onto account in this case. This doesn't cause any problems, but
let's add a check for the divider's enable-bit state, for consistency.

Acked-by: Peter De Schrijver <pdeschrijver@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>

authored by

Dmitry Osipenko and committed by
Thierry Reding
cf83a28f d8edf528

+7 -2
+7 -2
drivers/clk/tegra/clk-divider.c
··· 40 40 int div, mul; 41 41 u64 rate = parent_rate; 42 42 43 - reg = readl_relaxed(divider->reg) >> divider->shift; 44 - div = reg & div_mask(divider); 43 + reg = readl_relaxed(divider->reg); 44 + 45 + if ((divider->flags & TEGRA_DIVIDER_UART) && 46 + !(reg & PERIPH_CLK_UART_DIV_ENB)) 47 + return rate; 48 + 49 + div = (reg >> divider->shift) & div_mask(divider); 45 50 46 51 mul = get_mul(divider); 47 52 div += mul;