Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02621216 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-clk-fixes-for-4.19' of... 

Merge tag 'sunxi-clk-fixes-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes

Pull Allwinner clk fixes for 4.19 from Maxime Ripard:

One fix for the Audio PLL that were not properly set and generating noise
on the A10 SoCs.

* tag 'sunxi-clk-fixes-for-4.19' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  clk: sunxi-ng: sun4i: Set VCO and PLL bias current to lowest setting
parents bded6c03 80a6ec7d

drivers/clk/sunxi-ng/ccu-sun4i-a10.c

+9 −1
Original line number Diff line number Diff line
@@ -1434,8 +1434,16 @@ static void __init sun4i_ccu_init(struct device_node *node, 
		return;

	}



	/* Force the PLL-Audio-1x divider to 1 */

	val = readl(reg + SUN4I_PLL_AUDIO_REG);



	/*

	 * Force VCO and PLL bias current to lowest setting. Higher

	 * settings interfere with sigma-delta modulation and result

	 * in audible noise and distortions when using SPDIF or I2S.

	 */

	val &= ~GENMASK(25, 16);



	/* Force the PLL-Audio-1x divider to 1 */

	val &= ~GENMASK(29, 26);

	writel(val | (1 << 26), reg + SUN4I_PLL_AUDIO_REG);