From 0bd8fa260821f34a64163c01a74f293745527cef Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jul 2016 22:34:47 +0200 Subject: clk: sunxi-ng: h3: Fix audio clock divider offset The code had a typo and got the wrong offset for the hardcoded divider, fix that. Signed-off-by: Maxime Ripard Reported-by: Jean-Francois Moine Reported-by: Chen-Yu Tsai Signed-off-by: Michael Turquette Link: lkml.kernel.org/r/20160711203448.18062-1-maxime.ripard@free-electrons.com --- drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/clk') diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c index bcc0a95549d3..9af359544110 100644 --- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.c +++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.c @@ -817,8 +817,8 @@ static void __init sun8i_h3_ccu_setup(struct device_node *node) /* Force the PLL-Audio-1x divider to 4 */ val = readl(reg + SUN8I_H3_PLL_AUDIO_REG); - val &= ~GENMASK(4, 0); - writel(val | 3, reg + SUN8I_H3_PLL_AUDIO_REG); + val &= ~GENMASK(19, 16); + writel(val | (3 << 16), reg + SUN8I_H3_PLL_AUDIO_REG); sunxi_ccu_probe(node, reg, &sun8i_h3_ccu_desc); } -- cgit v1.2.3 From 5dc3916386c58fc97741abb1a013258a2b2b7346 Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 11 Jul 2016 22:34:48 +0200 Subject: clk: sunxi-ng: h3: Fix Kconfig symbol typo The Kconfig symbol for the sun8i SoC family was mistyped. Fix that. Signed-off-by: Maxime Ripard Signed-off-by: Michael Turquette Link: lkml.kernel.org/r/20160711203448.18062-2-maxime.ripard@free-electrons.com --- drivers/clk/sunxi-ng/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/clk') diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig index 41e53e8d4d41..2afcbd39e41e 100644 --- a/drivers/clk/sunxi-ng/Kconfig +++ b/drivers/clk/sunxi-ng/Kconfig @@ -60,6 +60,6 @@ config SUN8I_H3_CCU select SUNXI_CCU_NM select SUNXI_CCU_MP select SUNXI_CCU_PHASE - default ARCH_SUN8I + default MACH_SUN8I endif -- cgit v1.2.3