diff options
author | Dimitris Papastamos <dp@opensource.wolfsonmicro.com> | 2010-10-04 04:37:48 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-10-04 11:03:11 -0400 |
commit | 6c20c807cf5a13f61193d39bb718f7a9b5df3813 (patch) | |
tree | 7ff70ce5264cf5cd9efe9832742de406044a6ef7 /sound/soc/codecs/wm8804.c | |
parent | 86ce6c9a62c333157d3f2ef4e4dc1fe18b70eb63 (diff) |
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 b23c57ca7c26..2657f5c7ff08 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, | |||
395 | codec = dai->codec; | 395 | codec = dai->codec; |
396 | if (!freq_in || !freq_out) { | 396 | if (!freq_in || !freq_out) { |
397 | /* disable the PLL */ | 397 | /* disable the PLL */ |
398 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); | 398 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); |
399 | return 0; | 399 | return 0; |
400 | } else { | 400 | } else { |
401 | int ret; | 401 | int ret; |
@@ -406,7 +406,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, | |||
406 | return ret; | 406 | return ret; |
407 | 407 | ||
408 | /* power down the PLL before reprogramming it */ | 408 | /* power down the PLL before reprogramming it */ |
409 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); | 409 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); |
410 | 410 | ||
411 | if (!freq_in || !freq_out) | 411 | if (!freq_in || !freq_out) |
412 | return 0; | 412 | return 0; |
@@ -423,7 +423,7 @@ static int wm8804_set_pll(struct snd_soc_dai *dai, int pll_id, | |||
423 | snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); | 423 | snd_soc_write(codec, WM8804_PLL3, pll_div.k >> 16); |
424 | 424 | ||
425 | /* power up the PLL */ | 425 | /* power up the PLL */ |
426 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0x1); | 426 | snd_soc_update_bits(codec, WM8804_PWRDN, 0x1, 0); |
427 | } | 427 | } |
428 | 428 | ||
429 | return 0; | 429 | return 0; |