CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/ssm2602.c

 /*
  * File:         sound/soc/codecs/ssm2602.c
  * Author:       Cliff Cai <Cliff.Cai@analog.com>
  *
  * Created:      Tue June 06 2008
  * Description:  Driver for ssm2602 sound chip
  *
  * Modified:
  *               Copyright 2008 Analog Devices Inc.
  *
@@ skipping 20 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/initval.h>
 
 #include "ssm2602.h"
 
 #define SSM2602_VERSION "0.1"
 
 /* codec private data */
 struct ssm2602_priv {
         unsigned int sysclk;
         enum snd_soc_control_type control_type;
@@ skipping 148 matching lines @@
         {"ADC", NULL, "Input Mux"},
 
         /* inputs */
         {"Line Input", NULL, "LLINEIN"},
         {"Line Input", NULL, "RLINEIN"},
         {"Mic Bias", NULL, "MICIN"},
 };
 
 static int ssm2602_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, ssm2602_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, ssm2602_dapm_widgets,
                                   ARRAY_SIZE(ssm2602_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, audio_conn, ARRAY_SIZE(audio_conn));
+        snd_soc_dapm_add_routes(dapm, audio_conn, ARRAY_SIZE(audio_conn));
 
         return 0;
 }
 
 struct _coeff_div {
         u32 mclk;
         u32 rate;
         u16 fs;
         u8 sr:4;
         u8 bosr:1;
@@ skipping 262 matching lines @@
                 /* everything off except vref/vmid, */
                 ssm2602_write(codec, SSM2602_PWR, reg | PWR_CLK_OUT_PDN);
                 break;
         case SND_SOC_BIAS_OFF:
                 /* everything off, dac mute, inactive */
                 ssm2602_write(codec, SSM2602_ACTIVE, 0);
                 ssm2602_write(codec, SSM2602_PWR, 0xffff);
                 break;
 
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define SSM2602_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_32000 |\
                 SNDRV_PCM_RATE_44100 | SNDRV_PCM_RATE_48000 |\
                 SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
 
 #define SSM2602_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
                 SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
 
@@ skipping 172 matching lines @@
 {
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&ssm2602_i2c_driver);
 #endif
 }
 module_exit(ssm2602_exit);
 
 MODULE_DESCRIPTION("ASoC ssm2602 driver");
 MODULE_AUTHOR("Cliff Cai");
 MODULE_LICENSE("GPL");