diff options
| author | Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | 2010-10-04 09:37:48 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-04 08:03:11 -0700 |
| commit | 6c20c807cf5a13f61193d39bb718f7a9b5df3813 (patch) | |
| tree | 7ff70ce5264cf5cd9efe9832742de406044a6ef7 /sound/soc/codecs/wm8804.c | |
| parent | 86ce6c9a62c333157d3f2ef4e4dc1fe18b70eb63 (diff) | |
| download | op-kernel-dev-6c20c807cf5a13f61193d39bb718f7a9b5df3813.zip op-kernel-dev-6c20c807cf5a13f61193d39bb718f7a9b5df3813.tar.gz | |
ASoC: WM8804: Power down the PLL correctly
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>
Diffstat (limited to 'sound/soc/codecs/wm8804.c')
| -rw-r--r-- | sound/soc/codecs/wm8804.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c index b23c57c..2657f5c 100644 --- a/sound/soc/codecs/wm8804.c +++ b/sound/soc/codecs/wm8804.c @@ -395,7 +395,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, codec = dai->codec; if (!freq_in || !freq_out) { /* disable the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); return 0; } else { int ret; @@ -406,7 +406,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, return ret; /* 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) 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); /* power up the PLL */ - snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); + snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); } return 0; |
