CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/tlv320aic23.c

 /*
  * ALSA SoC TLV320AIC23 codec driver
  *
  * Author:      Arun KS, <arunks@mistralsolutions.com>
  * Copyright:   (C) 2008 Mistral Solutions Pvt Ltd.,
  *
  * Based on sound/soc/codecs/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
@@ skipping 12 matching lines @@
 #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/tlv.h>
 #include <sound/initval.h>
 
 #include "tlv320aic23.h"
 
 #define AIC23_VERSION "0.1"
 
 /*
  * AIC23 register cache
  */
@@ skipping 340 matching lines @@
                 get_current_sample_rates(codec, mclk, &adc, &dac);
                 printk(KERN_DEBUG "actual samplerate = %u,%u reg=%x\n",
                         adc, dac, data);
         }
 #endif
         return 0;
 }
 
 static int tlv320aic23_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
                                   ARRAY_SIZE(tlv320aic23_dapm_widgets));
-
         /* set up audio path interconnects */
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
         return 0;
 }
 
 static int tlv320aic23_hw_params(struct snd_pcm_substream *substream,
                                  struct snd_pcm_hw_params *params,
                                  struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
@@ skipping 158 matching lines @@
                 /* everything off except vref/vmid, */
                 tlv320aic23_write(codec, TLV320AIC23_PWR, reg | \
                         TLV320AIC23_CLK_OFF);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* everything off, dac mute, inactive */
                 tlv320aic23_write(codec, TLV320AIC23_ACTIVE, 0x0);
                 tlv320aic23_write(codec, TLV320AIC23_PWR, 0xffff);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define AIC23_RATES     SNDRV_PCM_RATE_8000_96000
 #define AIC23_FORMATS   (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE | \
                          SNDRV_PCM_FMTBIT_S24_3LE | SNDRV_PCM_FMTBIT_S32_LE)
 
 static struct snd_soc_dai_ops tlv320aic23_dai_ops = {
         .prepare        = tlv320aic23_pcm_prepare,
         .hw_params      = tlv320aic23_hw_params,
@@ skipping 183 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&tlv320aic23_i2c_driver);
 #endif
 }
 module_exit(tlv320aic23_exit);
 
 MODULE_DESCRIPTION("ASoC TLV320AIC23 codec driver");
 MODULE_AUTHOR("Arun KS <arunks@mistralsolutions.com>");
 MODULE_LICENSE("GPL");