CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8974.c

 /*
  * wm8974.c  --  WM8974 ALSA Soc Audio driver
  *
  * Copyright 2006-2009 Wolfson Microelectronics PLC.
  *
  * Author: Liam Girdwood <linux@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/kernel.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 "wm8974.h"
 
 static const u16 wm8974_reg[WM8974_CACHEREGNUM] = {
         0x0000, 0x0000, 0x0000, 0x0000,
         0x0050, 0x0000, 0x0140, 0x0000,
         0x0000, 0x0000, 0x0000, 0x00ff,
         0x0000, 0x0000, 0x0100, 0x00ff,
         0x0000, 0x0000, 0x012c, 0x002c,
         0x002c, 0x002c, 0x002c, 0x0000,
         0x0032, 0x0000, 0x0000, 0x0000,
         0x0000, 0x0000, 0x0000, 0x0000,
         0x0038, 0x000b, 0x0032, 0x0000,
         0x0008, 0x000c, 0x0093, 0x00e9,
         0x0000, 0x0000, 0x0000, 0x0000,
         0x0003, 0x0010, 0x0000, 0x0000,
         0x0000, 0x0002, 0x0000, 0x0000,
         0x0000, 0x0000, 0x0039, 0x0000,
         0x0000,
 };
 
 #define WM8974_POWER1_BIASEN  0x08
 #define WM8974_POWER1_BUFIOEN 0x04
 
 struct wm8974_priv {
         enum snd_soc_control_type control_type;
-        u16 reg_cache[WM8974_CACHEREGNUM];
 };
 
 #define wm8974_reset(c) snd_soc_write(c, WM8974_RESET, 0)
 
 static const char *wm8974_companding[] = {"Off", "NC", "u-law", "A-law" };
 static const char *wm8974_deemp[] = {"None", "32kHz", "44.1kHz", "48kHz" };
 static const char *wm8974_eqmode[] = {"Capture", "Playback" };
 static const char *wm8974_bw[] = {"Narrow", "Wide" };
 static const char *wm8974_eq1[] = {"80Hz", "105Hz", "135Hz", "175Hz" };
 static const char *wm8974_eq2[] = {"230Hz", "300Hz", "385Hz", "500Hz" };
@@ skipping 201 matching lines @@
         {"Input PGA", "Aux Switch", "Aux Input"},
         {"Input PGA", "MicN Switch", "MICN"},
         {"Input PGA", "MicP Switch", "MICP"},
 
         /* Inputs */
         {"Aux Input", NULL, "AUX"},
 };
 
 static int wm8974_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8974_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8974_dapm_widgets,
                                   ARRAY_SIZE(wm8974_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         return 0;
 }
 
 struct pll_ {
         unsigned int pre_div:1;
         unsigned int n:4;
         unsigned int k;
 };
 
@@ skipping 232 matching lines @@
         switch (level) {
         case SND_SOC_BIAS_ON:
         case SND_SOC_BIAS_PREPARE:
                 power1 |= 0x1;  /* VMID 50k */
                 snd_soc_write(codec, WM8974_POWER1, power1);
                 break;
 
         case SND_SOC_BIAS_STANDBY:
                 power1 |= WM8974_POWER1_BIASEN | WM8974_POWER1_BUFIOEN;
 
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Initial cap charge at VMID 5k */
                         snd_soc_write(codec, WM8974_POWER1, power1 | 0x3);
                         mdelay(100);
                 }
 
                 power1 |= 0x2;  /* VMID 500k */
                 snd_soc_write(codec, WM8974_POWER1, power1);
                 break;
 
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, WM8974_POWER1, 0);
                 snd_soc_write(codec, WM8974_POWER2, 0);
                 snd_soc_write(codec, WM8974_POWER3, 0);
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8974_RATES (SNDRV_PCM_RATE_8000_48000)
 
 #define WM8974_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_ops wm8974_ops = {
         .hw_params = wm8974_pcm_hw_params,
@@ skipping 148 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&wm8974_i2c_driver);
 #endif
 }
 module_exit(wm8974_exit);
 
 MODULE_DESCRIPTION("ASoC WM8974 driver");
 MODULE_AUTHOR("Liam Girdwood");
 MODULE_LICENSE("GPL");