CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8961.c

 /*
  * wm8961.c  --  WM8961 ALSA SoC Audio driver
  *
  * Author: Mark Brown
  *
  * 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.
  *
  * Currently unimplemented features:
  *  - ALC
  */
 
 #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/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 "wm8961.h"
 
 #define WM8961_MAX_REGISTER                     0xFC
 
 static u16 wm8961_reg_defaults[] = {
         0x009F,     /* R0   - Left Input volume */
         0x009F,     /* R1   - Right Input volume */
@@ skipping 246 matching lines @@
         0x0000,     /* R248 */
         0x0030,     /* R249 */
         0x0000,     /* R250 */
         0x0000,     /* R251 */
         0x0001,     /* R252 - General test 1 */
 };
 
 struct wm8961_priv {
         enum snd_soc_control_type control_type;
         int sysclk;
-        u16 reg_cache[WM8961_MAX_REGISTER];
 };
 
-static int wm8961_volatile_register(unsigned int reg)
+static int wm8961_volatile_register(struct snd_soc_codec *codec, unsigned int reg)
 {
         switch (reg) {
         case WM8961_SOFTWARE_RESET:
         case WM8961_WRITE_SEQUENCER_7:
         case WM8961_DC_SERVO_1:
                 return 1;
 
         default:
                 return 0;
         }
@@ skipping 568 matching lines @@
         /* This is all slightly unusual since we have no bypass paths
          * and the output amplifier structure means we can just slam
          * the biases straight up rather than having to ramp them
          * slowly.
          */
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
 
         case SND_SOC_BIAS_PREPARE:
-                if (codec->bias_level == SND_SOC_BIAS_STANDBY) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_STANDBY) {
                         /* Enable bias generation */
                         reg = snd_soc_read(codec, WM8961_ANTI_POP);
                         reg |= WM8961_BUFIOEN | WM8961_BUFDCOPEN;
                         snd_soc_write(codec, WM8961_ANTI_POP, reg);
 
                         /* VMID=2*50k, VREF */
                         reg = snd_soc_read(codec, WM8961_PWR_MGMT_1);
                         reg &= ~WM8961_VMIDSEL_MASK;
                         reg |= (1 << WM8961_VMIDSEL_SHIFT) | WM8961_VREF;
                         snd_soc_write(codec, WM8961_PWR_MGMT_1, reg);
                 }
                 break;
 
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_PREPARE) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_PREPARE) {
                         /* VREF off */
                         reg = snd_soc_read(codec, WM8961_PWR_MGMT_1);
                         reg &= ~WM8961_VREF;
                         snd_soc_write(codec, WM8961_PWR_MGMT_1, reg);
 
                         /* Bias generation off */
                         reg = snd_soc_read(codec, WM8961_ANTI_POP);
                         reg &= ~(WM8961_BUFIOEN | WM8961_BUFDCOPEN);
                         snd_soc_write(codec, WM8961_ANTI_POP, reg);
 
                         /* VMID off */
                         reg = snd_soc_read(codec, WM8961_PWR_MGMT_1);
                         reg &= ~WM8961_VMIDSEL_MASK;
                         snd_soc_write(codec, WM8961_PWR_MGMT_1, reg);
                 }
                 break;
 
         case SND_SOC_BIAS_OFF:
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
 
 
 #define WM8961_RATES SNDRV_PCM_RATE_8000_48000
 
 #define WM8961_FORMATS \
         (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
         SNDRV_PCM_FMTBIT_S24_LE)
@@ skipping 19 matching lines @@
                 .stream_name = "HiFi Capture",
                 .channels_min = 1,
                 .channels_max = 2,
                 .rates = WM8961_RATES,
                 .formats = WM8961_FORMATS,},
         .ops = &wm8961_dai_ops,
 };
 
 static int wm8961_probe(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret = 0;
         u16 reg;
 
         ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C);
         if (ret != 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
         reg = snd_soc_read(codec, WM8961_SOFTWARE_RESET);
@@ skipping 45 matching lines @@
          * we support.
          */
         reg = snd_soc_read(codec, WM8961_CLOCKING_3);
         reg &= ~WM8961_MANUAL_MODE;
         snd_soc_write(codec, WM8961_CLOCKING_3, reg);
 
         wm8961_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         snd_soc_add_controls(codec, wm8961_snd_controls,
                                 ARRAY_SIZE(wm8961_snd_controls));
-        snd_soc_dapm_new_controls(codec, wm8961_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8961_dapm_widgets,
                                   ARRAY_SIZE(wm8961_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
+        snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths));
 
         return 0;
 }
 
 static int wm8961_remove(struct snd_soc_codec *codec)
 {
         wm8961_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
@@ skipping 103 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8961_i2c_driver);
 #endif
 }
 module_exit(wm8961_exit);
 
 MODULE_DESCRIPTION("ASoC WM8961 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");