1 files changed, 30 insertions, 39 deletions

diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 4bbc0a79f01e..8212b3c8bfdd 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -26,6 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
+#include <linux/of_device.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
@@ -212,7 +213,7 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol,
         reg_cache[reg] = 0;
         reg_cache[reg2] = 0;
 
-        ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
+        ret = snd_soc_put_volsw(kcontrol, ucontrol);
         if (ret < 0)
                 return ret;
 
@@ -223,31 +224,19 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol,
         return 0;
 }
 
-#define SOC_WM8580_OUT_DOUBLE_R_TLV(xname, reg_left, reg_right, xshift, xmax, \
-                                    xinvert, tlv_array)                 \
-{       .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
-        .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
-                SNDRV_CTL_ELEM_ACCESS_READWRITE,  \
-        .tlv.p = (tlv_array), \
-        .info = snd_soc_info_volsw_2r, \
-        .get = snd_soc_get_volsw_2r, .put = wm8580_out_vu, \
-        .private_value = (unsigned long)&(struct soc_mixer_control) \
-                {.reg = reg_left, .rreg = reg_right, .shift = xshift, \
-                .max = xmax, .invert = xinvert} }
-
 static const struct snd_kcontrol_new wm8580_snd_controls[] = {
-SOC_WM8580_OUT_DOUBLE_R_TLV("DAC1 Playback Volume",
-                            WM8580_DIGITAL_ATTENUATION_DACL1,
-                            WM8580_DIGITAL_ATTENUATION_DACR1,
-                            0, 0xff, 0, dac_tlv),
-SOC_WM8580_OUT_DOUBLE_R_TLV("DAC2 Playback Volume",
-                            WM8580_DIGITAL_ATTENUATION_DACL2,
-                            WM8580_DIGITAL_ATTENUATION_DACR2,
-                            0, 0xff, 0, dac_tlv),
-SOC_WM8580_OUT_DOUBLE_R_TLV("DAC3 Playback Volume",
-                            WM8580_DIGITAL_ATTENUATION_DACL3,
-                            WM8580_DIGITAL_ATTENUATION_DACR3,
-                            0, 0xff, 0, dac_tlv),
+SOC_DOUBLE_R_EXT_TLV("DAC1 Playback Volume",
+                     WM8580_DIGITAL_ATTENUATION_DACL1,
+                     WM8580_DIGITAL_ATTENUATION_DACR1,
+                     0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
+SOC_DOUBLE_R_EXT_TLV("DAC2 Playback Volume",
+                     WM8580_DIGITAL_ATTENUATION_DACL2,
+                     WM8580_DIGITAL_ATTENUATION_DACR2,
+                     0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
+SOC_DOUBLE_R_EXT_TLV("DAC3 Playback Volume",
+                     WM8580_DIGITAL_ATTENUATION_DACL3,
+                     WM8580_DIGITAL_ATTENUATION_DACR3,
+                     0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
 
 SOC_SINGLE("DAC1 Deemphasis Switch", WM8580_DAC_CONTROL3, 0, 1, 0),
 SOC_SINGLE("DAC2 Deemphasis Switch", WM8580_DAC_CONTROL3, 1, 1, 0),
@@ -441,8 +430,7 @@ static int wm8580_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
         /* Always disable the PLL - it is not safe to leave it running
          * while reprogramming it.
          */
-        reg = snd_soc_read(codec, WM8580_PWRDN2);
-        snd_soc_write(codec, WM8580_PWRDN2, reg | pwr_mask);
+        snd_soc_update_bits(codec, WM8580_PWRDN2, pwr_mask, pwr_mask);
 
         if (!freq_in || !freq_out)
                 return 0;
@@ -460,8 +448,7 @@ static int wm8580_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id,
         snd_soc_write(codec, WM8580_PLLA4 + offset, reg);
 
         /* All done, turn it on */
-        reg = snd_soc_read(codec, WM8580_PWRDN2);
-        snd_soc_write(codec, WM8580_PWRDN2, reg & ~pwr_mask);
+        snd_soc_update_bits(codec, WM8580_PWRDN2, pwr_mask, 0);
 
         return 0;
 }
@@ -759,7 +746,6 @@ static int wm8580_digital_mute(struct snd_soc_dai *codec_dai, int mute)
 static int wm8580_set_bias_level(struct snd_soc_codec *codec,
         enum snd_soc_bias_level level)
 {
-        u16 reg;
         switch (level) {
         case SND_SOC_BIAS_ON:
         case SND_SOC_BIAS_PREPARE:
@@ -768,20 +754,19 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec,
         case SND_SOC_BIAS_STANDBY:
                 if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Power up and get individual control of the DACs */
-                        reg = snd_soc_read(codec, WM8580_PWRDN1);
-                        reg &= ~(WM8580_PWRDN1_PWDN | WM8580_PWRDN1_ALLDACPD);
-                        snd_soc_write(codec, WM8580_PWRDN1, reg);
+                        snd_soc_update_bits(codec, WM8580_PWRDN1,
+                                            WM8580_PWRDN1_PWDN |
+                                            WM8580_PWRDN1_ALLDACPD, 0);
 
                         /* Make VMID high impedance */
-                        reg = snd_soc_read(codec,  WM8580_ADC_CONTROL1);
-                        reg &= ~0x100;
-                        snd_soc_write(codec, WM8580_ADC_CONTROL1, reg);
+                        snd_soc_update_bits(codec, WM8580_ADC_CONTROL1,
+                                            0x100, 0);
                 }
                 break;
 
         case SND_SOC_BIAS_OFF:
-                reg = snd_soc_read(codec, WM8580_PWRDN1);
-                snd_soc_write(codec, WM8580_PWRDN1, reg | WM8580_PWRDN1_PWDN);
+                snd_soc_update_bits(codec, WM8580_PWRDN1,
+                                    WM8580_PWRDN1_PWDN, WM8580_PWRDN1_PWDN);
                 break;
         }
         codec->dapm.bias_level = level;
@@ -907,6 +892,11 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
         .reg_cache_default = wm8580_reg,
 };
 
+static const struct of_device_id wm8580_of_match[] = {
+        { .compatible = "wlf,wm8580" },
+        { },
+};
+
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 static int wm8580_i2c_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
@@ -943,8 +933,9 @@ MODULE_DEVICE_TABLE(i2c, wm8580_i2c_id);
 
 static struct i2c_driver wm8580_i2c_driver = {
         .driver = {
-                .name = "wm8580-codec",
+                .name = "wm8580",
                 .owner = THIS_MODULE,
+                .of_match_table = wm8580_of_match,
         },
         .probe =    wm8580_i2c_probe,
         .remove =   wm8580_i2c_remove,