* [PATCH v2 RESEND] ASoC: wm9081: Use snd_soc_update_bits for read-modify-write
@ 2011-10-19 3:06 Axel Lin
2011-10-19 8:10 ` Girdwood, Liam
2011-11-04 22:17 ` Mark Brown
0 siblings, 2 replies; 4+ messages in thread
From: Axel Lin @ 2011-10-19 3:06 UTC (permalink / raw)
To: linux-kernel; +Cc: Mark Brown, Dimitris Papastamos, Liam Girdwood, alsa-devel
Use snd_soc_update_bits for read-modify-write register access instead of
open-coding it using snd_soc_read and snd_soc_write
Signed-off-by: Axel Lin <axel.lin@gmail.com>
---
RESEND:
I just found I doesn't set my mail client properly to show correct sender,
so here is a resend.
v2:
For Initial cold start ( change bias level from SND_SOC_BIAS_OFF to
SND_SOC_BIAS_STANDBY ), the v1 does not set VMID_SEL[1:0] bits
correctly for Normal bias enable & soft start off.
In v2 we also clear VMID_SEL[1:0] bits for Normal bias enable & soft start off.
We did clear VMID_SEL[1:0] bits in SND_SOC_BIAS_OFF,
thus we know the VMID_SEL[1:0] bits status is 0b00 in this case.
sound/soc/codecs/wm9081.c | 82 +++++++++++++++++++-------------------------
1 files changed, 35 insertions(+), 47 deletions(-)
diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
index 66092ef..9c38ddb 100644
--- a/sound/soc/codecs/wm9081.c
+++ b/sound/soc/codecs/wm9081.c
@@ -766,84 +766,73 @@ static const struct snd_soc_dapm_route wm9081_audio_paths[] = {
static int wm9081_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level)
{
- u16 reg;
-
switch (level) {
case SND_SOC_BIAS_ON:
break;
case SND_SOC_BIAS_PREPARE:
/* VMID=2*40k */
- reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
- reg &= ~WM9081_VMID_SEL_MASK;
- reg |= 0x2;
- snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
+ snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
+ WM9081_VMID_SEL_MASK, 0x2);
/* Normal bias current */
- reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
- reg &= ~WM9081_STBY_BIAS_ENA;
- snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
+ snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
+ WM9081_STBY_BIAS_ENA, 0);
break;
case SND_SOC_BIAS_STANDBY:
/* Initial cold start */
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
/* Disable LINEOUT discharge */
- reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL);
- reg &= ~WM9081_LINEOUT_DISCH;
- snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg);
+ snd_soc_update_bits(codec, WM9081_ANTI_POP_CONTROL,
+ WM9081_LINEOUT_DISCH, 0);
/* Select startup bias source */
- reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
- reg |= WM9081_BIAS_SRC | WM9081_BIAS_ENA;
- snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
+ snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
+ WM9081_BIAS_SRC | WM9081_BIAS_ENA,
+ WM9081_BIAS_SRC | WM9081_BIAS_ENA);
/* VMID 2*4k; Soft VMID ramp enable */
- reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
- reg |= WM9081_VMID_RAMP | 0x6;
- snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
-
+ snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
+ WM9081_VMID_RAMP | 0x6,
+ WM9081_VMID_RAMP | 0x6);
mdelay(100);
/* Normal bias enable & soft start off */
- reg |= WM9081_BIAS_ENA;
- reg &= ~WM9081_VMID_RAMP;
- snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
+ snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
+ WM9081_VMID_RAMP | WM9081_BIAS_ENA |
+ WM9081_VMID_SEL_MASK,
+ WM9081_BIAS_ENA);
/* Standard bias source */
- reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
- reg &= ~WM9081_BIAS_SRC;
- snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
+ snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
+ WM9081_BIAS_SRC, 0);
}
/* VMID 2*240k */
- reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
- reg &= ~WM9081_VMID_SEL_MASK;
- reg |= 0x04;
- snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
+ snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
+ WM9081_VMID_SEL_MASK, 0x04);
/* Standby bias current on */
- reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
- reg |= WM9081_STBY_BIAS_ENA;
- snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
+ snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
+ WM9081_STBY_BIAS_ENA,
+ WM9081_STBY_BIAS_ENA);
break;
case SND_SOC_BIAS_OFF:
/* Startup bias source */
- reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
- reg |= WM9081_BIAS_SRC;
- snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
+ snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
+ WM9081_BIAS_SRC, WM9081_BIAS_SRC);
/* Disable VMID and biases with soft ramping */
- reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
- reg &= ~(WM9081_VMID_SEL_MASK | WM9081_BIAS_ENA);
- reg |= WM9081_VMID_RAMP;
- snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
+ snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
+ WM9081_VMID_RAMP | WM9081_VMID_SEL_MASK |
+ WM9081_BIAS_ENA, WM9081_VMID_RAMP);
/* Actively discharge LINEOUT */
- reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL);
- reg |= WM9081_LINEOUT_DISCH;
- snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg);
+ snd_soc_update_bits(codec, WM9081_ANTI_POP_CONTROL,
+ WM9081_LINEOUT_DISCH,
+ WM9081_LINEOUT_DISCH);
break;
}
@@ -1242,11 +1231,10 @@ static int wm9081_probe(struct snd_soc_codec *codec)
wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Enable zero cross by default */
- reg = snd_soc_read(codec, WM9081_ANALOGUE_LINEOUT);
- snd_soc_write(codec, WM9081_ANALOGUE_LINEOUT, reg | WM9081_LINEOUTZC);
- reg = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_PGA);
- snd_soc_write(codec, WM9081_ANALOGUE_SPEAKER_PGA,
- reg | WM9081_SPKPGAZC);
+ snd_soc_update_bits(codec, WM9081_ANALOGUE_LINEOUT,
+ WM9081_LINEOUTZC, WM9081_LINEOUTZC);
+ snd_soc_update_bits(codec, WM9081_ANALOGUE_SPEAKER_PGA,
+ WM9081_SPKPGAZC, WM9081_SPKPGAZC);
snd_soc_add_controls(codec, wm9081_snd_controls,
ARRAY_SIZE(wm9081_snd_controls));
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 RESEND] ASoC: wm9081: Use snd_soc_update_bits for read-modify-write
2011-10-19 3:06 [PATCH v2 RESEND] ASoC: wm9081: Use snd_soc_update_bits for read-modify-write Axel Lin
@ 2011-10-19 8:10 ` Girdwood, Liam
2011-11-04 22:17 ` Mark Brown
1 sibling, 0 replies; 4+ messages in thread
From: Girdwood, Liam @ 2011-10-19 8:10 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Mark Brown, Dimitris Papastamos, alsa-devel
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 9266 bytes --]
On 19 October 2011 04:06, Axel Lin <axel.lin@gmail.com> wrote:
> Use snd_soc_update_bits for read-modify-write register access instead of
> open-coding it using snd_soc_read and snd_soc_write
>
> Signed-off-by: Axel Lin <axel.lin@gmail.com>
> ---
> RESEND:
> I just found I doesn't set my mail client properly to show correct sender,
> so here is a resend.
>
> v2:
> For Initial cold start ( change bias level from SND_SOC_BIAS_OFF to
> SND_SOC_BIAS_STANDBY ), the v1 does not set VMID_SEL[1:0] bits
> correctly for Normal bias enable & soft start off.
> In v2 we also clear VMID_SEL[1:0] bits for Normal bias enable & soft start off.
> We did clear VMID_SEL[1:0] bits in SND_SOC_BIAS_OFF,
> thus we know the VMID_SEL[1:0] bits status is 0b00 in this case.
>
The mechanics look OK, but best for Mark to check with the hardware.
Acked-by: Liam Girdwood <lrg@ti.com>
> Â sound/soc/codecs/wm9081.c | Â 82 +++++++++++++++++++-------------------------
> Â 1 files changed, 35 insertions(+), 47 deletions(-)
>
> diff --git a/sound/soc/codecs/wm9081.c b/sound/soc/codecs/wm9081.c
> index 66092ef..9c38ddb 100644
> --- a/sound/soc/codecs/wm9081.c
> +++ b/sound/soc/codecs/wm9081.c
> @@ -766,84 +766,73 @@ static const struct snd_soc_dapm_route wm9081_audio_paths[] = {
> Â static int wm9081_set_bias_level(struct snd_soc_codec *codec,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â enum snd_soc_bias_level level)
> Â {
> - Â Â Â u16 reg;
> -
> Â Â Â Â switch (level) {
> Â Â Â Â case SND_SOC_BIAS_ON:
> Â Â Â Â Â Â Â Â break;
>
> Â Â Â Â case SND_SOC_BIAS_PREPARE:
> Â Â Â Â Â Â Â Â /* VMID=2*40k */
> - Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
> - Â Â Â Â Â Â Â reg &= ~WM9081_VMID_SEL_MASK;
> - Â Â Â Â Â Â Â reg |= 0x2;
> - Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
> + Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_VMID_SEL_MASK, 0x2);
>
> Â Â Â Â Â Â Â Â /* Normal bias current */
> - Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
> - Â Â Â Â Â Â Â reg &= ~WM9081_STBY_BIAS_ENA;
> - Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
> + Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_STBY_BIAS_ENA, 0);
> Â Â Â Â Â Â Â Â break;
>
> Â Â Â Â case SND_SOC_BIAS_STANDBY:
> Â Â Â Â Â Â Â Â /* Initial cold start */
> Â Â Â Â Â Â Â Â if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
> Â Â Â Â Â Â Â Â Â Â Â Â /* Disable LINEOUT discharge */
> - Â Â Â Â Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL);
> - Â Â Â Â Â Â Â Â Â Â Â reg &= ~WM9081_LINEOUT_DISCH;
> - Â Â Â Â Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg);
> + Â Â Â Â Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_ANTI_POP_CONTROL,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_LINEOUT_DISCH, 0);
>
> Â Â Â Â Â Â Â Â Â Â Â Â /* Select startup bias source */
> - Â Â Â Â Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
> - Â Â Â Â Â Â Â Â Â Â Â reg |= WM9081_BIAS_SRC | WM9081_BIAS_ENA;
> - Â Â Â Â Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
> + Â Â Â Â Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_BIAS_SRC | WM9081_BIAS_ENA,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_BIAS_SRC | WM9081_BIAS_ENA);
>
> Â Â Â Â Â Â Â Â Â Â Â Â /* VMID 2*4k; Soft VMID ramp enable */
> - Â Â Â Â Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
> - Â Â Â Â Â Â Â Â Â Â Â reg |= WM9081_VMID_RAMP | 0x6;
> - Â Â Â Â Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
> -
> + Â Â Â Â Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_VMID_RAMP | 0x6,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_VMID_RAMP | 0x6);
> Â Â Â Â Â Â Â Â Â Â Â Â mdelay(100);
>
> Â Â Â Â Â Â Â Â Â Â Â Â /* Normal bias enable & soft start off */
> - Â Â Â Â Â Â Â Â Â Â Â reg |= WM9081_BIAS_ENA;
> - Â Â Â Â Â Â Â Â Â Â Â reg &= ~WM9081_VMID_RAMP;
> - Â Â Â Â Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
> + Â Â Â Â Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_VMID_RAMP | WM9081_BIAS_ENA |
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_VMID_SEL_MASK,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_BIAS_ENA);
>
> Â Â Â Â Â Â Â Â Â Â Â Â /* Standard bias source */
> - Â Â Â Â Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
> - Â Â Â Â Â Â Â Â Â Â Â reg &= ~WM9081_BIAS_SRC;
> - Â Â Â Â Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
> + Â Â Â Â Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_BIAS_SRC, 0);
> Â Â Â Â Â Â Â Â }
>
> Â Â Â Â Â Â Â Â /* VMID 2*240k */
> - Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
> - Â Â Â Â Â Â Â reg &= ~WM9081_VMID_SEL_MASK;
> - Â Â Â Â Â Â Â reg |= 0x04;
> - Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
> + Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_VMID_SEL_MASK, 0x04);
>
> Â Â Â Â Â Â Â Â /* Standby bias current on */
> - Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
> - Â Â Â Â Â Â Â reg |= WM9081_STBY_BIAS_ENA;
> - Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
> + Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_STBY_BIAS_ENA,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_STBY_BIAS_ENA);
> Â Â Â Â Â Â Â Â break;
>
> Â Â Â Â case SND_SOC_BIAS_OFF:
> Â Â Â Â Â Â Â Â /* Startup bias source */
> - Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1);
> - Â Â Â Â Â Â Â reg |= WM9081_BIAS_SRC;
> - Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
> + Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_BIAS_SRC, WM9081_BIAS_SRC);
>
> Â Â Â Â Â Â Â Â /* Disable VMID and biases with soft ramping */
> - Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_VMID_CONTROL);
> - Â Â Â Â Â Â Â reg &= ~(WM9081_VMID_SEL_MASK | WM9081_BIAS_ENA);
> - Â Â Â Â Â Â Â reg |= WM9081_VMID_RAMP;
> - Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
> + Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_VMID_RAMP | WM9081_VMID_SEL_MASK |
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_BIAS_ENA, WM9081_VMID_RAMP);
>
> Â Â Â Â Â Â Â Â /* Actively discharge LINEOUT */
> - Â Â Â Â Â Â Â reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL);
> - Â Â Â Â Â Â Â reg |= WM9081_LINEOUT_DISCH;
> - Â Â Â Â Â Â Â snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg);
> + Â Â Â Â Â Â Â snd_soc_update_bits(codec, WM9081_ANTI_POP_CONTROL,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_LINEOUT_DISCH,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_LINEOUT_DISCH);
> Â Â Â Â Â Â Â Â break;
> Â Â Â Â }
>
> @@ -1242,11 +1231,10 @@ static int wm9081_probe(struct snd_soc_codec *codec)
> Â Â Â Â wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
>
> Â Â Â Â /* Enable zero cross by default */
> - Â Â Â reg = snd_soc_read(codec, WM9081_ANALOGUE_LINEOUT);
> - Â Â Â snd_soc_write(codec, WM9081_ANALOGUE_LINEOUT, reg | WM9081_LINEOUTZC);
> - Â Â Â reg = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_PGA);
> - Â Â Â snd_soc_write(codec, WM9081_ANALOGUE_SPEAKER_PGA,
> - Â Â Â Â Â Â Â Â Â Â reg | WM9081_SPKPGAZC);
> + Â Â Â snd_soc_update_bits(codec, WM9081_ANALOGUE_LINEOUT,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_LINEOUTZC, WM9081_LINEOUTZC);
> + Â Â Â snd_soc_update_bits(codec, WM9081_ANALOGUE_SPEAKER_PGA,
> + Â Â Â Â Â Â Â Â Â Â Â Â Â WM9081_SPKPGAZC, WM9081_SPKPGAZC);
>
> Â Â Â Â snd_soc_add_controls(codec, wm9081_snd_controls,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â ARRAY_SIZE(wm9081_snd_controls));
> --
> 1.7.5.4
>
>
>
>
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 RESEND] ASoC: wm9081: Use snd_soc_update_bits for read-modify-write
2011-10-19 3:06 [PATCH v2 RESEND] ASoC: wm9081: Use snd_soc_update_bits for read-modify-write Axel Lin
2011-10-19 8:10 ` Girdwood, Liam
@ 2011-11-04 22:17 ` Mark Brown
2011-11-05 6:46 ` Axel Lin
1 sibling, 1 reply; 4+ messages in thread
From: Mark Brown @ 2011-11-04 22:17 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Dimitris Papastamos, Liam Girdwood, alsa-devel
On Wed, Oct 19, 2011 at 11:06:27AM +0800, Axel Lin wrote:
> /* Normal bias enable & soft start off */
> - reg |= WM9081_BIAS_ENA;
> - reg &= ~WM9081_VMID_RAMP;
> - snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
> + snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
> + WM9081_VMID_RAMP | WM9081_BIAS_ENA |
> + WM9081_VMID_SEL_MASK,
> + WM9081_BIAS_ENA);
This looks (and sounds) wrong - the original code didn't touch
VMID_SEL_MASK for this update but the new version will clear
VMID_SEL_MASK. Even with that fixed there still seems to be some issue
here, though.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 RESEND] ASoC: wm9081: Use snd_soc_update_bits for read-modify-write
2011-11-04 22:17 ` Mark Brown
@ 2011-11-05 6:46 ` Axel Lin
0 siblings, 0 replies; 4+ messages in thread
From: Axel Lin @ 2011-11-05 6:46 UTC (permalink / raw)
To: Mark Brown; +Cc: linux-kernel, Dimitris Papastamos, Liam Girdwood, alsa-devel
2011/11/5 Mark Brown <broonie@opensource.wolfsonmicro.com>:
> On Wed, Oct 19, 2011 at 11:06:27AM +0800, Axel Lin wrote:
>
>> /* Normal bias enable & soft start off */
>> - reg |= WM9081_BIAS_ENA;
>> - reg &= ~WM9081_VMID_RAMP;
>> - snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
>> + snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
>> + WM9081_VMID_RAMP | WM9081_BIAS_ENA |
>> + WM9081_VMID_SEL_MASK,
>> + WM9081_BIAS_ENA);
>
> This looks (and sounds) wrong - the original code didn't touch
> VMID_SEL_MASK for this update but the new version will clear
> VMID_SEL_MASK. Even with that fixed there still seems to be some issue
> here, though.
>
Hi Mark,
I just re-check current code, and I think current code (before converting to
snd_soc_update_bits) is broken.
See below 2 patches: ( I'm sending the patch now)
ASoC: wm9081: Fix reading wrong register for setting VMID 2*240k
ASoC: wm9081: Don't write WM9081_BIAS_ENA bit to WM9081_VMID_CONTROL register
Would you mind to test if above 2 patches works.
If it works, I'll send a new patch to use snd_soc_update_bits for
read-modify-write.
Thanks,
Axel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-11-05 6:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-19 3:06 [PATCH v2 RESEND] ASoC: wm9081: Use snd_soc_update_bits for read-modify-write Axel Lin
2011-10-19 8:10 ` Girdwood, Liam
2011-11-04 22:17 ` Mark Brown
2011-11-05 6:46 ` Axel Lin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox