Merge tag 'sunxi-clk-fixes-for-5.4-1' of... (78bdf57e) · Commits · 戴 / test

Merge tag 'sunxi-clk-fixes-for-5.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes Two patches that fix some operator precedence and zeroing of bits * tag 'sunxi-clk-fixes-for-5.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: clk: sunxi-ng: a80: fix the zero'ing of bits 16 and 18 clk: sunxi: Fix operator precedence in sunxi_divs_clk_setup

drivers/clk/sunxi-ng/ccu-sun9i-a80.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1224,7 +1224,7 @@ static int sun9i_a80_ccu_probe(struct platform_device *pdev)

		/* Enforce d1 = 0, d2 = 0 for Audio PLL */
		val = readl(reg + SUN9I_A80_PLL_AUDIO_REG);
		val &= (BIT(16) & BIT(18));
		val &= ~(BIT(16) \| BIT(18));
		writel(val, reg + SUN9I_A80_PLL_AUDIO_REG);

		/* Enforce P = 1 for both CPU cluster PLLs */

+2 −2

Original line number	Diff line number	Diff line
		@@ -1080,8 +1080,8 @@ static struct clk ** __init sunxi_divs_clk_setup(struct device_node *node,
		rate_hw, rate_ops,
		gate_hw, &clk_gate_ops,
		clkflags \|
		data->div[i].critical ?
		CLK_IS_CRITICAL : 0);
		(data->div[i].critical ?
		CLK_IS_CRITICAL : 0));

		WARN_ON(IS_ERR(clk_data->clks[i]));
		}