CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/wm8728.c

 /*
  * wm8728.c  --  WM8728 ALSA SoC Audio driver
  *
  * Copyright 2008 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.
  */
 
 #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 "wm8728.h"
 
 /*
  * We can't read the WM8728 register space so we cache them instead.
  * Note that the defaults here aren't the physical defaults, we latch
  * the volume update bits, mute the output and enable infinite zero
  * detect.
@@ skipping 29 matching lines @@
 SND_SOC_DAPM_OUTPUT("VOUTR"),
 };
 
 static const struct snd_soc_dapm_route intercon[] = {
         {"VOUTL", NULL, "DAC"},
         {"VOUTR", NULL, "DAC"},
 };
 
 static int wm8728_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, wm8728_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, wm8728_dapm_widgets,
                                   ARRAY_SIZE(wm8728_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
         return 0;
 }
 
 static int wm8728_mute(struct snd_soc_dai *dai, int mute)
 {
         struct snd_soc_codec *codec = dai->codec;
         u16 mute_reg = snd_soc_read(codec, WM8728_DACCTL);
 
         if (mute)
@@ skipping 83 matching lines @@
 static int wm8728_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
         u16 reg;
         int i;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
         case SND_SOC_BIAS_PREPARE:
         case SND_SOC_BIAS_STANDBY:
-                if (codec->bias_level == SND_SOC_BIAS_OFF) {
+                if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
                         /* Power everything up... */
                         reg = snd_soc_read(codec, WM8728_DACCTL);
                         snd_soc_write(codec, WM8728_DACCTL, reg & ~0x4);
 
                         /* ..then sync in the register cache. */
                         for (i = 0; i < ARRAY_SIZE(wm8728_reg_defaults); i++)
                                 snd_soc_write(codec, i,
                                              snd_soc_read(codec, i));
                 }
                 break;
 
         case SND_SOC_BIAS_OFF:
                 reg = snd_soc_read(codec, WM8728_DACCTL);
                 snd_soc_write(codec, WM8728_DACCTL, reg | 0x4);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define WM8728_RATES (SNDRV_PCM_RATE_8000_192000)
 
 #define WM8728_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
         SNDRV_PCM_FMTBIT_S24_LE)
 
 static struct snd_soc_dai_ops wm8728_dai_ops = {
         .hw_params      = wm8728_hw_params,
@@ skipping 176 matching lines @@
 #endif
 #if defined(CONFIG_SPI_MASTER)
         spi_unregister_driver(&wm8728_spi_driver);
 #endif
 }
 module_exit(wm8728_exit);
 
 MODULE_DESCRIPTION("ASoC WM8728 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_LICENSE("GPL");