ASoC: wm8903: Move register default changes to I2C probe

Also convert to use update_bits() while we're at it. No great need to do
this, it's just a bit neater to do as much as possible in the I2C probe.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Tested-by: Stephen Warren <swarren@wwwdotorg.org>

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index 7261a68aac6fa87ac39272b1c6d5d06a27d15b90..73f1c8d7bafbdc591e990f2dc2fd678a61ff1f8a 100644 (file)
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -1896,7 +1896,6 @@ static int wm8903_probe(struct snd_soc_codec *codec)
 {
        struct wm8903_priv *wm8903 = snd_soc_codec_get_drvdata(codec);
        int ret;
-       u16 val;
 
        wm8903->codec = codec;
        codec->control_data = wm8903->regmap;
@@ -1910,37 +1909,6 @@ static int wm8903_probe(struct snd_soc_codec *codec)
        /* power on device */
        wm8903_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
-       /* Latch volume update bits */
-       val = snd_soc_read(codec, WM8903_ADC_DIGITAL_VOLUME_LEFT);
-       val |= WM8903_ADCVU;
-       snd_soc_write(codec, WM8903_ADC_DIGITAL_VOLUME_LEFT, val);
-       snd_soc_write(codec, WM8903_ADC_DIGITAL_VOLUME_RIGHT, val);
-
-       val = snd_soc_read(codec, WM8903_DAC_DIGITAL_VOLUME_LEFT);
-       val |= WM8903_DACVU;
-       snd_soc_write(codec, WM8903_DAC_DIGITAL_VOLUME_LEFT, val);
-       snd_soc_write(codec, WM8903_DAC_DIGITAL_VOLUME_RIGHT, val);
-
-       val = snd_soc_read(codec, WM8903_ANALOGUE_OUT1_LEFT);
-       val |= WM8903_HPOUTVU;
-       snd_soc_write(codec, WM8903_ANALOGUE_OUT1_LEFT, val);
-       snd_soc_write(codec, WM8903_ANALOGUE_OUT1_RIGHT, val);
-
-       val = snd_soc_read(codec, WM8903_ANALOGUE_OUT2_LEFT);
-       val |= WM8903_LINEOUTVU;
-       snd_soc_write(codec, WM8903_ANALOGUE_OUT2_LEFT, val);
-       snd_soc_write(codec, WM8903_ANALOGUE_OUT2_RIGHT, val);
-
-       val = snd_soc_read(codec, WM8903_ANALOGUE_OUT3_LEFT);
-       val |= WM8903_SPKVU;
-       snd_soc_write(codec, WM8903_ANALOGUE_OUT3_LEFT, val);
-       snd_soc_write(codec, WM8903_ANALOGUE_OUT3_RIGHT, val);
-
-       /* Enable DAC soft mute by default */
-       snd_soc_update_bits(codec, WM8903_DAC_DIGITAL_1,
-                           WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE,
-                           WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE);
-
        return ret;
 }
 
@@ -2197,6 +2165,37 @@ static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
                                   WM8903_IM_WSEQ_BUSY_EINT, 0);
        }
 
+       /* Latch volume update bits */
+       regmap_update_bits(wm8903->regmap, WM8903_ADC_DIGITAL_VOLUME_LEFT,
+                          WM8903_ADCVU, WM8903_ADCVU);
+       regmap_update_bits(wm8903->regmap, WM8903_ADC_DIGITAL_VOLUME_RIGHT,
+                          WM8903_ADCVU, WM8903_ADCVU);
+
+       regmap_update_bits(wm8903->regmap, WM8903_DAC_DIGITAL_VOLUME_LEFT,
+                          WM8903_DACVU, WM8903_DACVU);
+       regmap_update_bits(wm8903->regmap, WM8903_DAC_DIGITAL_VOLUME_RIGHT,
+                          WM8903_DACVU, WM8903_DACVU);
+
+       regmap_update_bits(wm8903->regmap, WM8903_ANALOGUE_OUT1_LEFT,
+                          WM8903_HPOUTVU, WM8903_HPOUTVU);
+       regmap_update_bits(wm8903->regmap, WM8903_ANALOGUE_OUT1_RIGHT,
+                          WM8903_HPOUTVU, WM8903_HPOUTVU);
+
+       regmap_update_bits(wm8903->regmap, WM8903_ANALOGUE_OUT2_LEFT,
+                          WM8903_LINEOUTVU, WM8903_LINEOUTVU);
+       regmap_update_bits(wm8903->regmap, WM8903_ANALOGUE_OUT2_RIGHT,
+                          WM8903_LINEOUTVU, WM8903_LINEOUTVU);
+
+       regmap_update_bits(wm8903->regmap, WM8903_ANALOGUE_OUT3_LEFT,
+                          WM8903_SPKVU, WM8903_SPKVU);
+       regmap_update_bits(wm8903->regmap, WM8903_ANALOGUE_OUT3_RIGHT,
+                          WM8903_SPKVU, WM8903_SPKVU);
+
+       /* Enable DAC soft mute by default */
+       regmap_update_bits(wm8903->regmap, WM8903_DAC_DIGITAL_1,
+                          WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE,
+                          WM8903_DAC_MUTEMODE | WM8903_DAC_MUTE);
+
        ret = snd_soc_register_codec(&i2c->dev,
                        &soc_codec_dev_wm8903, &wm8903_dai, 1);
        if (ret != 0)