Commit fa10a92b authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'asoc/topic/wm8804' into asoc-next

parents 3dfa480b 1edbd356
...@@ -395,9 +395,6 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, ...@@ -395,9 +395,6 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
/* power down the PLL before reprogramming it */ /* power down the PLL before reprogramming it */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);
if (!freq_in || !freq_out)
return 0;
/* set PLLN and PRESCALE */ /* set PLLN and PRESCALE */
snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10, snd_soc_update_bits(codec, WM8804_PLL4, 0xf | 0x10,
pll_div.n | (pll_div.prescale << 4)); pll_div.n | (pll_div.prescale << 4));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment