aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2021-06-21 16:33:56 -0700
committerStephen Boyd <sboyd@kernel.org>2021-06-21 16:33:56 -0700
commitee7fe68769ec862886d30528c057cfb7d013e692 (patch)
treec543199b152fa8770ac0b0ea457f64328beb207b
parentLinux 5.13-rc1 (diff)
parentclk: sunxi-ng: v3s: fix incorrect postdivider on pll-audio (diff)
downloadwireguard-linux-ee7fe68769ec862886d30528c057cfb7d013e692.tar.xz
wireguard-linux-ee7fe68769ec862886d30528c057cfb7d013e692.zip
Merge tag 'sunxi-clk-fixes-for-5.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner
Pull one Allwinner clk driver update from Maxime Ripard: - One patch to fix a divider on the v3s Audio PLL * tag 'sunxi-clk-fixes-for-5.13-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: clk: sunxi-ng: v3s: fix incorrect postdivider on pll-audio
-rw-r--r--drivers/clk/sunxi-ng/ccu-sun8i-v3s.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
index a774942cb153..f49724a22540 100644
--- a/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
@@ -817,10 +817,10 @@ static void __init sun8i_v3_v3s_ccu_init(struct device_node *node,
return;
}
- /* Force the PLL-Audio-1x divider to 4 */
+ /* Force the PLL-Audio-1x divider to 1 */
val = readl(reg + SUN8I_V3S_PLL_AUDIO_REG);
val &= ~GENMASK(19, 16);
- writel(val | (3 << 16), reg + SUN8I_V3S_PLL_AUDIO_REG);
+ writel(val, reg + SUN8I_V3S_PLL_AUDIO_REG);
sunxi_ccu_probe(node, reg, ccu_desc);
}