Merge remote-tracking branch 'asoc/topic/wm8985' into asoc-next (63ddcd7b) · Commits · e / devices / android_kernel_oneplus_sm8150

sound/soc/codecs/wm8985.c

+20 −23

Original line number	Diff line number	Diff line
		@@ -830,18 +830,14 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id,
		struct pll_div pll_div;

		codec = dai->codec;
		if (freq_in && freq_out) {
		if (!freq_in \|\| !freq_out) {
		/* disable the PLL */
		snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
		WM8985_PLLEN_MASK, 0);
		} else {
		ret = pll_factors(&pll_div, freq_out * 4 * 2, freq_in);
		if (ret)
		return ret;
		}

		/* disable the PLL before reprogramming it */
		snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
		WM8985_PLLEN_MASK, 0);

		if (!freq_in \|\| !freq_out)
		return 0;

		/* set PLLN and PRESCALE */
		snd_soc_write(codec, WM8985_PLL_N,
		@@ -857,6 +853,7 @@ static int wm8985_set_pll(struct snd_soc_dai *dai, int pll_id,
		/* enable the PLL */
		snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
		WM8985_PLLEN_MASK, WM8985_PLLEN);
		}
		return 0;
		}