CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/cq93vc.c

 /*
  * ALSA SoC CQ0093 Voice Codec Driver for DaVinci platforms
  *
  * Copyright (C) 2010 Texas Instruments, Inc
  *
  * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ skipping 18 matching lines @@
 #include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
 #include <linux/mfd/davinci_voicecodec.h>
 #include <linux/spi/spi.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dai.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 
 #include <mach/dm365.h>
 
 static inline unsigned int cq93vc_read(struct snd_soc_codec *codec,
                                                 unsigned int reg)
 {
         struct davinci_vc *davinci_vc = codec->control_data;
 
         return readl(davinci_vc->base + reg);
@@ skipping 58 matching lines @@
         case SND_SOC_BIAS_STANDBY:
                 cq93vc_write(codec, DAVINCI_VC_REG12,
                              DAVINCI_VC_REG12_POWER_ALL_OFF);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* force all power off */
                 cq93vc_write(codec, DAVINCI_VC_REG12,
                              DAVINCI_VC_REG12_POWER_ALL_OFF);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
 
         return 0;
 }
 
 #define CQ93VC_RATES    (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000)
 #define CQ93VC_FORMATS  (SNDRV_PCM_FMTBIT_U8 | SNDRV_PCM_FMTBIT_S16_LE)
 
 static struct snd_soc_dai_ops cq93vc_dai_ops = {
         .digital_mute   = cq93vc_mute,
         .set_sysclk     = cq93vc_set_dai_sysclk,
@@ skipping 18 matching lines @@
 
 static int cq93vc_resume(struct snd_soc_codec *codec)
 {
         cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
         return 0;
 }
 
 static int cq93vc_probe(struct snd_soc_codec *codec)
 {
-        struct davinci_vc *davinci_vc = codec->dev->platform_data;
+        struct davinci_vc *davinci_vc = snd_soc_codec_get_drvdata(codec);
 
         davinci_vc->cq93vc.codec = codec;
         codec->control_data = davinci_vc;
 
         /* Set controls */
         snd_soc_add_controls(codec, cq93vc_snd_controls,
                              ARRAY_SIZE(cq93vc_snd_controls));
 
         /* Off, with power on */
         cq93vc_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
@@ skipping 47 matching lines @@
 
 static void __exit cq93vc_exit(void)
 {
         platform_driver_unregister(&cq93vc_codec_driver);
 }
 module_exit(cq93vc_exit);
 
 MODULE_DESCRIPTION("Texas Instruments DaVinci ASoC CQ0093 Voice Codec Driver");
 MODULE_AUTHOR("Miguel Aguilar");
 MODULE_LICENSE("GPL");