CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8955.c

 /*
  * wm8955.c  --  WM8955 ALSA SoC Audio driver
  *
  * Copyright 2009 Wolfson Microelectronics plc
  *
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/pm.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 #include <sound/wm8955.h>
 
 #include "wm8955.h"
 
 #define WM8955_NUM_SUPPLIES 4
 static const char *wm8955_supply_names[WM8955_NUM_SUPPLIES] = {
         "DCVDD",
         "DBVDD",
@@ skipping 532 matching lines @@
 
         { "MOUT PGA", NULL, "Mono" },
         { "MONOOUT", NULL, "MOUT PGA" },
 
         /* OUT3 not currently implemented */
         { "OUT3", NULL, "OUT3 PGA" },
 };
 
 static int wm8955_add_widgets(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
         snd_soc_add_controls(codec, wm8955_snd_controls,
                              ARRAY_SIZE(wm8955_snd_controls));
 
-        snd_soc_dapm_new_controls(codec, wm8955_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8955_dapm_widgets,
                                   ARRAY_SIZE(wm8955_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, wm8955_intercon,
+        snd_soc_dapm_add_routes(dapm, wm8955_intercon,
                                 ARRAY_SIZE(wm8955_intercon));
 
         return 0;
 }
 
 static int wm8955_hw_params(struct snd_pcm_substream *substream,
                             struct snd_pcm_hw_params *params,
                             struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
@@ skipping 183 matching lines @@
                                     WM8955_VMIDSEL_MASK,
                                     0x1 << WM8955_VMIDSEL_SHIFT);
 
                 /* Default bias current */
                 snd_soc_update_bits(codec, WM8955_ADDITIONAL_CONTROL_1,
                                     WM8955_VSEL_MASK,
                                     0x2 << WM8955_VSEL_SHIFT);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         ret = regulator_bulk_enable(ARRAY_SIZE(wm8955->supplies),
                                                     wm8955->supplies);
                         if (ret != 0) {
                                 dev_err(codec->dev,
                                         "Failed to enable supplies: %d\n",
                                         ret);
                                 return ret;
                         }
 
                         /* Sync back cached values if they're
@@ skipping 43 matching lines @@
 
                 /* Turn off VMID and VREF */
                 snd_soc_update_bits(codec, WM8955_POWER_MANAGEMENT_1,
                                     WM8955_VREF |
                                     WM8955_VMIDSEL_MASK, 0);
 
                 regulator_bulk_disable(ARRAY_SIZE(wm8955->supplies),
                                        wm8955->supplies);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8955_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8955_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 static struct snd_soc_dai_ops wm8955_dai_ops = {
         .set_sysclk = wm8955_set_sysclk,
@@ skipping 63 matching lines @@
                 goto err_get;
         }
 
         ret = wm8955_reset(codec);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to issue reset: %d\n", ret);
                 goto err_enable;
         }
 
         /* Change some default settings - latch VU and enable ZC */
-        reg_cache[WM8955_LEFT_DAC_VOLUME] |= WM8955_LDVU;
-        reg_cache[WM8955_RIGHT_DAC_VOLUME] |= WM8955_RDVU;
-        reg_cache[WM8955_LOUT1_VOLUME] |= WM8955_LO1VU | WM8955_LO1ZC;
-        reg_cache[WM8955_ROUT1_VOLUME] |= WM8955_RO1VU | WM8955_RO1ZC;
-        reg_cache[WM8955_LOUT2_VOLUME] |= WM8955_LO2VU | WM8955_LO2ZC;
-        reg_cache[WM8955_ROUT2_VOLUME] |= WM8955_RO2VU | WM8955_RO2ZC;
-        reg_cache[WM8955_MONOOUT_VOLUME] |= WM8955_MOZC;
+        snd_soc_update_bits(codec, WM8955_LEFT_DAC_VOLUME,
+                            WM8955_LDVU, WM8955_LDVU);
+        snd_soc_update_bits(codec, WM8955_RIGHT_DAC_VOLUME,
+                            WM8955_RDVU, WM8955_RDVU);
+        snd_soc_update_bits(codec, WM8955_LOUT1_VOLUME,
+                            WM8955_LO1VU | WM8955_LO1ZC,
+                            WM8955_LO1VU | WM8955_LO1ZC);
+        snd_soc_update_bits(codec, WM8955_ROUT1_VOLUME,
+                            WM8955_RO1VU | WM8955_RO1ZC,
+                            WM8955_RO1VU | WM8955_RO1ZC);
+        snd_soc_update_bits(codec, WM8955_LOUT2_VOLUME,
+                            WM8955_LO2VU | WM8955_LO2ZC,
+                            WM8955_LO2VU | WM8955_LO2ZC);
+        snd_soc_update_bits(codec, WM8955_ROUT2_VOLUME,
+                            WM8955_RO2VU | WM8955_RO2ZC,
+                            WM8955_RO2VU | WM8955_RO2ZC);
+        snd_soc_update_bits(codec, WM8955_MONOOUT_VOLUME,
+                            WM8955_MOZC, WM8955_MOZC);
 
         /* Also enable adaptive bass boost by default */
-        reg_cache[WM8955_BASS_CONTROL] |= WM8955_BB;
+        snd_soc_update_bits(codec, WM8955_BASS_CONTROL, WM8955_BB, WM8955_BB);
 
         /* Set platform data values */
         if (pdata) {
                 if (pdata->out2_speaker)
                         reg_cache[WM8955_ADDITIONAL_CONTROL_2]
                                 |= WM8955_ROUT2INV;
 
                 if (pdata->monoin_diff)
                         reg_cache[WM8955_MONO_OUT_MIX_1]
                                 |= WM8955_DMEN;
@@ skipping 97 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8955_i2c_driver);
 #endif
 }
 module_exit(wm8955_exit);
 
 MODULE_DESCRIPTION("ASoC WM8955 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");