CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8711.c

 /*
  * wm8711.c  --  WM8711 ALSA SoC Audio driver
  *
  * Copyright 2006 Wolfson Microelectronics
  *
  * Author: Mike Arthur <linux@wolfsonmicro.com>
  *
  * Based on wm8731.c by Richard Purdie
  *
  * 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/spi/spi.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/tlv.h>
 #include <sound/initval.h>
 
 #include "wm8711.h"
 
 /* codec private data */
 struct wm8711_priv {
         enum snd_soc_control_type bus_type;
-        u16 reg_cache[WM8711_CACHEREGNUM];
         unsigned int sysclk;
 };
 
 /*
  * wm8711 register cache
  * We can't read the WM8711 register space when we are
  * using 2 wire for device control, so we cache them instead.
  * There is no point in caching the reset register
  */
 static const u16 wm8711_reg[WM8711_CACHEREGNUM] = {
@@ skipping 38 matching lines @@
 
         /* outputs */
         {"RHPOUT", NULL, "Output Mixer"},
         {"ROUT", NULL, "Output Mixer"},
         {"LHPOUT", NULL, "Output Mixer"},
         {"LOUT", NULL, "Output Mixer"},
 };
 
 static int wm8711_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8711_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8711_dapm_widgets,
                                   ARRAY_SIZE(wm8711_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
         return 0;
 }
 
 struct _coeff_div {
         u32 mclk;
         u32 rate;
         u16 fs;
         u8 sr:4;
         u8 bosr:1;
@@ skipping 201 matching lines @@
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
                 snd_soc_write(codec, WM8711_PWR, reg | 0x0040);
                 break;
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, WM8711_ACTIVE, 0x0);
                 snd_soc_write(codec, WM8711_PWR, 0xffff);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8711_RATES SNDRV_PCM_RATE_8000_96000
 
 #define WM8711_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_ops wm8711_ops = {
         .prepare = wm8711_pcm_prepare,
@@ skipping 201 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8711_spi_driver);
 #endif
 }
 module_exit(wm8711_exit);
 
 MODULE_DESCRIPTION("ASoC WM8711 driver");
 MODULE_AUTHOR("Mike Arthur");
 MODULE_LICENSE("GPL");