lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: WM8804: Power down the PLL correctly

Browse Source 
The PLL is disabled when the corresponding bit is set not the other
way around.  This commit depends on my other commit with Subject
"ASoC: WM8804: Refactor set_pll code to avoid GCC warnings".

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Dimitris Papastamos
2010-10-04 09:37:48 +01:00
committed by Mark Brown
parent 86ce6c9a62
commit 6c20c807cf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/wm8804.c
View File

@@ -395,7 +395,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
codec = dai->codec; codec = dai->codec;
if (!freq_in || !freq_out) { if (!freq_in || !freq_out) {
/* disable the PLL */ /* disable the PLL */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);
return 0; return 0;
} else { } else {
int ret; int ret;
@@ -406,7 +406,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
return ret; return ret;
/* power down the PLL before reprogramming it */ /* power down the PLL before reprogramming it */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1);
if (!freq_in || !freq_out) if (!freq_in || !freq_out)
return 0; return 0;
@@ -423,7 +423,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id,
snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16);
/* power up the PLL */ /* power up the PLL */
snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0);
} }
return 0; return 0;