All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: WM8804: Power down the PLL correctly
@ 2010-10-04  8:37 Dimitris Papastamos
  2010-10-04 10:11 ` Liam Girdwood
  2010-10-04 15:03 ` Mark Brown
  0 siblings, 2 replies; 3+ messages in thread
From: Dimitris Papastamos @ 2010-10-04  8:37 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood; +Cc: alsa-devel, patches

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>
---
 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;
-- 
1.7.3.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ASoC: WM8804: Power down the PLL correctly
  2010-10-04  8:37 [PATCH] ASoC: WM8804: Power down the PLL correctly Dimitris Papastamos
@ 2010-10-04 10:11 ` Liam Girdwood
  2010-10-04 15:03 ` Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Liam Girdwood @ 2010-10-04 10:11 UTC (permalink / raw)
  To: Dimitris Papastamos; +Cc: alsa-devel, Mark Brown, patches

On Mon, 2010-10-04 at 09:37 +0100, Dimitris Papastamos wrote:
> 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>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ASoC: WM8804: Power down the PLL correctly
  2010-10-04  8:37 [PATCH] ASoC: WM8804: Power down the PLL correctly Dimitris Papastamos
  2010-10-04 10:11 ` Liam Girdwood
@ 2010-10-04 15:03 ` Mark Brown
  1 sibling, 0 replies; 3+ messages in thread
From: Mark Brown @ 2010-10-04 15:03 UTC (permalink / raw)
  To: Dimitris Papastamos; +Cc: alsa-devel, patches, Liam Girdwood

On Mon, Oct 04, 2010 at 09:37:48AM +0100, Dimitris Papastamos wrote:
> 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>

Applied, thanks.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2010-10-04 15:03 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-04  8:37 [PATCH] ASoC: WM8804: Power down the PLL correctly Dimitris Papastamos
2010-10-04 10:11 ` Liam Girdwood
2010-10-04 15:03 ` Mark Brown

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.