Skip to contentSkip to conversation

ASoC: wm8940: Properly set codec->dapm.bias_level

PATCH Applied Axel Lin 2 participants 5 messages Oct 26, 2011 – Oct 27, 2011

Subsystems (3)
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

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

---
 sound/soc/codecs/wm8940.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
sound/soc/codecs/wm8940.c +2 -0
index fec3892..e8a4ca3 100644
@@ -488,6 +488,8 @@ static int wm8940_set_bias_level(struct snd_soc_codec *codec,
 		break;
 	}
 
+	codec->dapm.bias_level = level;
+
 	return ret;
 }
 
Signature · 1 line
1.7.5.4
author
#1 lore raw

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

According to the datasheet:
BCLK is controlled by BIT[4:2] of WM8940_CLOCK(06h) register.

---
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(-)
sound/soc/codecs/wm8940.c +1 -1
index e8a4ca3..1b5856b 100644
@@ -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:
Signature · 1 line
1.7.5.4
#2 lore raw

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

Quoted 2 lines · Axel Lin

According to the datasheet:
BCLK is controlled by BIT[4:2] of WM8940_CLOCK(06h) register.

This doesn't apply against current code.

author
#3 lore raw

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

2011/10/27 Mark Brown <[email protected]>:

Quoted 6 lines · Axel Lin
Quoted 2 lines

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