[PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level

[PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level

[Axel Lin]

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

[PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV

[Axel Lin]

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

Re: [PATCH 1/2] ASoC: wm8940: Properly set codec->dapm.bias_level

[Mark Brown]

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.

Re: [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV

[Mark Brown]

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.

Re: [PATCH 2/2] ASoC: wm8940: Fix mask for setting BCLKDIV

[Axel Lin]

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