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

Commit c0cff31b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Stephen writes:
  "clk fixes for v4.19-rc8

   One fix for the Allwinner A10 SoC's audio PLL that wasn't properly
   set and generating noise."

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: sunxi-ng: sun4i: Set VCO and PLL bias current to lowest setting
parents b955a910 02621216

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);