CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8985.c

 /*
  * wm8985.c  --  WM8985 ALSA SoC Audio driver
  *
  * Copyright 2010 Wolfson Microelectronics plc
  *
  * Author: Dimitris Papastamos <dp@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:
  *  o Add OUT3/OUT4 mixer controls.
  */
 
 #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/regulator/consumer.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 "wm8985.h"
 
 #define WM8985_NUM_SUPPLIES 4
 static const char *wm8985_supply_names[WM8985_NUM_SUPPLIES] = {
         "DCVDD",
         "DBVDD",
         "AVDD1",
@@ skipping 486 matching lines @@
                             ucontrol->value.integer.value[0]
                             << WM8985_EQ3DMODE_SHIFT);
         /* restore DAC/ADC configuration */
         snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, regpwr2);
         snd_soc_write(codec, WM8985_POWER_MANAGEMENT_3, regpwr3);
         return 0;
 }
 
 static int wm8985_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8985_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8985_dapm_widgets,
                                   ARRAY_SIZE(wm8985_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, audio_map,
+        snd_soc_dapm_add_routes(dapm, audio_map,
                                 ARRAY_SIZE(audio_map));
         return 0;
 }
 
 static int wm8985_reset(struct snd_soc_codec *codec)
 {
         return snd_soc_write(codec, WM8985_SOFTWARE_RESET, 0x0);
 }
 
 static int wm8985_dac_mute(struct snd_soc_dai *dai, int mute)
@@ skipping 322 matching lines @@
         wm8985 = snd_soc_codec_get_drvdata(codec);
         switch (level) {
         case SND_SOC_BIAS_ON:
         case SND_SOC_BIAS_PREPARE:
                 /* VMID at 75k */
                 snd_soc_update_bits(codec, WM8985_POWER_MANAGEMENT_1,
                                     WM8985_VMIDSEL_MASK,
                                     1 << WM8985_VMIDSEL_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(wm8985->supplies),
                                                     wm8985->supplies);
                         if (ret) {
                                 dev_err(codec->dev,
                                         "Failed to enable supplies: %d\n",
                                         ret);
                                 return ret;
                         }
 
                         wm8985_sync_cache(codec);
@@ skipping 39 matching lines @@
                 snd_soc_write(codec, WM8985_POWER_MANAGEMENT_2, 0);
                 snd_soc_write(codec, WM8985_POWER_MANAGEMENT_3, 0);
 
                 codec->cache_sync = 1;
 
                 regulator_bulk_disable(ARRAY_SIZE(wm8985->supplies),
                                        wm8985->supplies);
                 break;
         }
 
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #ifdef CONFIG_PM
 static int wm8985_suspend(struct snd_soc_codec *codec, pm_message_t state)
 {
         wm8985_set_bias_level(codec, SND_SOC_BIAS_OFF);
         return 0;
 }
 
@@ skipping 230 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8985_spi_driver);
 #endif
 }
 module_exit(wm8985_exit);
 
 MODULE_DESCRIPTION("ASoC WM8985 driver");
 MODULE_AUTHOR("Dimitris Papastamos <dp@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");