CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8776.c

 /*
  * wm8776.c  --  WM8776 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.
  *
  * TODO: Input ALC/limiter support
  */
 
 #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/initval.h>
 #include <sound/tlv.h>
 
 #include "wm8776.h"
 
 /* codec private data */
 struct wm8776_priv {
         enum snd_soc_control_type control_type;
         int sysclk[2];
 };
@@ skipping 260 matching lines @@
 
 static int wm8776_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
         switch (level) {
         case SND_SOC_BIAS_ON:
                 break;
         case SND_SOC_BIAS_PREPARE:
                 break;
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Disable the global powerdown; DAPM does the rest */
                         snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 0);
                 }
 
                 break;
         case SND_SOC_BIAS_OFF:
                 snd_soc_update_bits(codec, WM8776_PWRDOWN, 1, 1);
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8776_RATES (SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\
                       SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 |\
                       SNDRV_PCM_RATE_96000)
 
 
 #define WM8776_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
@@ skipping 66 matching lines @@
         return 0;
 }
 #else
 #define wm8776_suspend NULL
 #define wm8776_resume NULL
 #endif
 
 static int wm8776_probe(struct snd_soc_codec *codec)
 {
         struct wm8776_priv *wm8776 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret = 0;
 
         ret = snd_soc_codec_set_cache_io(codec, 7, 9, wm8776->control_type);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
                 return ret;
         }
 
         ret = wm8776_reset(codec);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to issue reset: %d\n", ret);
                 return ret;
         }
 
         wm8776_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         /* Latch the update bits; right channel only since we always
          * update both. */
         snd_soc_update_bits(codec, WM8776_HPRVOL, 0x100, 0x100);
         snd_soc_update_bits(codec, WM8776_DACRVOL, 0x100, 0x100);
 
         snd_soc_add_controls(codec, wm8776_snd_controls,
                              ARRAY_SIZE(wm8776_snd_controls));
-        snd_soc_dapm_new_controls(codec, wm8776_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8776_dapm_widgets,
                                   ARRAY_SIZE(wm8776_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, routes, ARRAY_SIZE(routes));
+        snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes));
 
         return ret;
 }
 
 /* power down chip */
 static int wm8776_remove(struct snd_soc_codec *codec)
 {
         wm8776_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
@@ skipping 119 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8776_spi_driver);
 #endif
 }
 module_exit(wm8776_exit);
 
 MODULE_DESCRIPTION("ASoC WM8776 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");