evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: wm9081: Use snd_soc_update_bits for read-modify-write

Browse source 
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>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Axel Lin 2011-11-09 17:00:05 +08:00 • committed by Mark Brown
parent 7d6f6b0f39
commit b402735883
1 changed files with 35 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
sound/soc/codecs/wm9081.c
View file

@ -826,84 +826,74 @@ static const struct snd_soc_dapm_route wm9081_audio_paths[] = {
static int wm9081_set_bias_level(struct snd_soc_codec *codec, static int wm9081_set_bias_level(struct snd_soc_codec *codec,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
u16 reg;
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
break; break;
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
/* VMID=2*40k */ /* VMID=2*40k */
reg = snd_soc_read(codec, WM9081_VMID_CONTROL); snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
reg &= ~WM9081_VMID_SEL_MASK; WM9081_VMID_SEL_MASK, 0x2);
reg |= 0x2;
snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
/* Normal bias current */ /* Normal bias current */
reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1); snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
reg &= ~WM9081_STBY_BIAS_ENA; WM9081_STBY_BIAS_ENA, 0);
snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
/* Initial cold start */ /* Initial cold start */
if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) { if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
/* Disable LINEOUT discharge */ /* Disable LINEOUT discharge */
reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL); snd_soc_update_bits(codec, WM9081_ANTI_POP_CONTROL,
reg &= ~WM9081_LINEOUT_DISCH; WM9081_LINEOUT_DISCH, 0);
snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg);
/* Select startup bias source */ /* Select startup bias source */
reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1); snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
reg |= WM9081_BIAS_SRC | WM9081_BIAS_ENA; WM9081_BIAS_SRC | WM9081_BIAS_ENA,
snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg); WM9081_BIAS_SRC | WM9081_BIAS_ENA);
/* VMID 2*4k; Soft VMID ramp enable */ /* VMID 2*4k; Soft VMID ramp enable */
reg = snd_soc_read(codec, WM9081_VMID_CONTROL); snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
reg |= WM9081_VMID_RAMP | 0x6; WM9081_VMID_RAMP |
snd_soc_write(codec, WM9081_VMID_CONTROL, reg); WM9081_VMID_SEL_MASK,
WM9081_VMID_RAMP | 0x6);
mdelay(100); mdelay(100);
/* Normal bias enable & soft start off */ /* Normal bias enable & soft start off */
reg &= ~WM9081_VMID_RAMP; snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
snd_soc_write(codec, WM9081_VMID_CONTROL, reg); WM9081_VMID_RAMP, 0);
/* Standard bias source */ /* Standard bias source */
reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1); snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
reg &= ~WM9081_BIAS_SRC; WM9081_BIAS_SRC, 0);
snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
} }
/* VMID 2*240k */ /* VMID 2*240k */
reg = snd_soc_read(codec, WM9081_VMID_CONTROL); snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
reg &= ~WM9081_VMID_SEL_MASK; WM9081_VMID_SEL_MASK, 0x04);
reg |= 0x04;
snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
/* Standby bias current on */ /* Standby bias current on */
reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1); snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
reg |= WM9081_STBY_BIAS_ENA; WM9081_STBY_BIAS_ENA,
snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg); WM9081_STBY_BIAS_ENA);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
/* Startup bias source and disable bias */ /* Startup bias source and disable bias */
reg = snd_soc_read(codec, WM9081_BIAS_CONTROL_1); snd_soc_update_bits(codec, WM9081_BIAS_CONTROL_1,
reg |= WM9081_BIAS_SRC; WM9081_BIAS_SRC | WM9081_BIAS_ENA,
reg &= ~WM9081_BIAS_ENA; WM9081_BIAS_SRC);
snd_soc_write(codec, WM9081_BIAS_CONTROL_1, reg);
/* Disable VMID with soft ramping */ /* Disable VMID with soft ramping */
reg = snd_soc_read(codec, WM9081_VMID_CONTROL); snd_soc_update_bits(codec, WM9081_VMID_CONTROL,
reg &= ~WM9081_VMID_SEL_MASK; WM9081_VMID_RAMP | WM9081_VMID_SEL_MASK,
reg |= WM9081_VMID_RAMP; WM9081_VMID_RAMP);
snd_soc_write(codec, WM9081_VMID_CONTROL, reg);
/* Actively discharge LINEOUT */ /* Actively discharge LINEOUT */
reg = snd_soc_read(codec, WM9081_ANTI_POP_CONTROL); snd_soc_update_bits(codec, WM9081_ANTI_POP_CONTROL,
reg |= WM9081_LINEOUT_DISCH; WM9081_LINEOUT_DISCH,
snd_soc_write(codec, WM9081_ANTI_POP_CONTROL, reg); WM9081_LINEOUT_DISCH);
break; break;
} }
@ -1291,11 +1281,10 @@ static int wm9081_probe(struct snd_soc_codec *codec)
wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY); wm9081_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
/* Enable zero cross by default */ /* Enable zero cross by default */
reg = snd_soc_read(codec, WM9081_ANALOGUE_LINEOUT); snd_soc_update_bits(codec, WM9081_ANALOGUE_LINEOUT,
snd_soc_write(codec, WM9081_ANALOGUE_LINEOUT, reg | WM9081_LINEOUTZC); WM9081_LINEOUTZC, WM9081_LINEOUTZC);
reg = snd_soc_read(codec, WM9081_ANALOGUE_SPEAKER_PGA); snd_soc_update_bits(codec, WM9081_ANALOGUE_SPEAKER_PGA,
snd_soc_write(codec, WM9081_ANALOGUE_SPEAKER_PGA, WM9081_SPKPGAZC, WM9081_SPKPGAZC);
reg | WM9081_SPKPGAZC);
if (!wm9081->pdata.num_retune_configs) { if (!wm9081->pdata.num_retune_configs) {
dev_dbg(codec->dev, dev_dbg(codec->dev,