* [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level
@ 2011-10-26 1:53 Axel Lin
2011-10-26 1:55 ` [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV Axel Lin
2011-10-27 7:16 ` [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level Mark Brown
0 siblings, 2 replies; 7+ messages in thread
From: Axel Lin @ 2011-10-26 1:53 UTC (permalink / raw)
To: linux-kernel
Cc: Chris Paulson-Ellis, Mark Brown, Dimitris Papastamos,
Liam Girdwood, alsa-devel
Reported-by: Chris Paulson-Ellis <chris@edesix.com>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
sound/soc/codecs/wm8940.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index fec3892..e8a4ca3 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -488,6 +488,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
break;
}
+ codec->dapm.bias_level = level;
+
return ret;
}
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV
2011-10-26 1:53 [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level Axel Lin
@ 2011-10-26 1:55 ` Axel Lin
2011-10-27 7:17 ` Mark Brown
2011-10-27 7:16 ` [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level Mark Brown
1 sibling, 1 reply; 7+ messages in thread
From: Axel Lin @ 2011-10-26 1:55 UTC (permalink / raw)
To: linux-kernel
Cc: Chris Paulson-Ellis, Mark Brown, Dimitris Papastamos,
Liam Girdwood, alsa-devel
According to the datasheet:
BCLK is controlled by BIT[4:2] of WM8940_CLOCK(06h) register.
Signed-off-by: Chris Paulson-Ellis <chris@edesix.com>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
I got the patch from Chris, thus add his signed-off-by here.
sound/soc/codecs/wm8940.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c
index e8a4ca3..1b5856b 100644
--- a/sound/soc/codecs/wm8940.c
+++ b/sound/soc/codecs/wm8940.c
@@ -621,7 +621,7 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai,
switch (div_id) {
case WM8940_BCLKDIV:
- reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFEF3;
+ reg = snd_soc_read(codec, WM8940_CLOCK) & 0xFFE3;
ret = snd_soc_write(codec, WM8940_CLOCK, reg | (div << 2));
break;
case WM8940_MCLKDIV:
--
1.7.5.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV
2011-10-26 1:55 ` [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV Axel Lin
@ 2011-10-27 7:17 ` Mark Brown
0 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2011-10-27 7:17 UTC (permalink / raw)
To: Axel Lin
Cc: Dimitris Papastamos, Chris Paulson-Ellis, linux-kernel,
alsa-devel, Liam Girdwood
On Wed, Oct 26, 2011 at 09:55:39AM +0800, Axel Lin wrote:
> According to the datasheet:
> BCLK is controlled by BIT[4:2] of WM8940_CLOCK(06h) register.
This doesn't apply against current code.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV
@ 2011-10-27 7:17 ` Mark Brown
0 siblings, 0 replies; 7+ messages in thread
From: Mark Brown @ 2011-10-27 7:17 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Chris Paulson-Ellis, Dimitris Papastamos,
Liam Girdwood, alsa-devel
On Wed, Oct 26, 2011 at 09:55:39AM +0800, Axel Lin wrote:
> According to the datasheet:
> BCLK is controlled by BIT[4:2] of WM8940_CLOCK(06h) register.
This doesn't apply against current code.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV
2011-10-27 7:17 ` Mark Brown
@ 2011-10-27 8:24 ` Axel Lin
-1 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2011-10-27 8:24 UTC (permalink / raw)
To: Mark Brown
Cc: Dimitris Papastamos, Chris Paulson-Ellis, linux-kernel,
alsa-devel, Liam Girdwood
2011/10/27 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Wed, Oct 26, 2011 at 09:55:39AM +0800, Axel Lin wrote:
>> According to the datasheet:
>> BCLK is controlled by BIT[4:2] of WM8940_CLOCK(06h) register.
>
> This doesn't apply against current code.
>
Ooops. sorry.
I generate the patch base on the for-3.3 branch of the asoc tree.
The commit bdb527e "ASoC: wm8940: Fix a typo for the mask of setting
WM8940_BCLKDIV"
in the for-3.3 branch should be dropped, because it is fixed by this commit now.
I'll send a v2 base on your for-next tree.
Thanks,
Axel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV
@ 2011-10-27 8:24 ` Axel Lin
0 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2011-10-27 8:24 UTC (permalink / raw)
To: Mark Brown
Cc: linux-kernel, Chris Paulson-Ellis, Dimitris Papastamos,
Liam Girdwood, alsa-devel
2011/10/27 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Wed, Oct 26, 2011 at 09:55:39AM +0800, Axel Lin wrote:
>> According to the datasheet:
>> BCLK is controlled by BIT[4:2] of WM8940_CLOCK(06h) register.
>
> This doesn't apply against current code.
>
Ooops. sorry.
I generate the patch base on the for-3.3 branch of the asoc tree.
The commit bdb527e "ASoC: wm8940: Fix a typo for the mask of setting
WM8940_BCLKDIV"
in the for-3.3 branch should be dropped, because it is fixed by this commit now.
I'll send a v2 base on your for-next tree.
Thanks,
Axel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level
2011-10-26 1:53 [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level Axel Lin
2011-10-26 1:55 ` [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV Axel Lin
@ 2011-10-27 7:16 ` Mark Brown
1 sibling, 0 replies; 7+ messages in thread
From: Mark Brown @ 2011-10-27 7:16 UTC (permalink / raw)
To: Axel Lin
Cc: linux-kernel, Chris Paulson-Ellis, Dimitris Papastamos,
Liam Girdwood, alsa-devel
On Wed, Oct 26, 2011 at 09:53:41AM +0800, Axel Lin wrote:
> Reported-by: Chris Paulson-Ellis <chris@edesix.com>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
I've applied this one, thanks.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-10-27 8:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-26 1:53 [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level Axel Lin
2011-10-26 1:55 ` [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV Axel Lin
2011-10-27 7:17 ` Mark Brown
2011-10-27 7:17 ` Mark Brown
2011-10-27 8:24 ` Axel Lin
2011-10-27 8:24 ` Axel Lin
2011-10-27 7:16 ` [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level 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.