CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/ak4671.c

 /*
  * ak4671.c  --  audio driver for AK4671
  *
  * Copyright (C) 2009 Samsung Electronics Co.Ltd
  * Author: Joonyoung Shim <jy0922.shim@samsung.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 (at your
  *  option) any later version.
  *
  */
 
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/initval.h>
 #include <sound/tlv.h>
 
 #include "ak4671.h"
 
 
 /* codec private data */
 struct ak4671_priv {
         enum snd_soc_control_type control_type;
         void *control_data;
-        u8 reg_cache[AK4671_CACHEREGNUM];
 };
 
 /* ak4671 register cache & default register settings */
 static const u8 ak4671_reg[AK4671_CACHEREGNUM] = {
         0x00,   /* AK4671_AD_DA_POWER_MANAGEMENT        (0x00)  */
         0xf6,   /* AK4671_PLL_MODE_SELECT0              (0x01)  */
         0x00,   /* AK4671_PLL_MODE_SELECT1              (0x02)  */
         0x02,   /* AK4671_FORMAT_SELECT                 (0x03)  */
         0x00,   /* AK4671_MIC_SIGNAL_SELECT             (0x04)  */
         0x55,   /* AK4671_MIC_AMP_GAIN                  (0x05)  */
@@ skipping 388 matching lines @@
         {"LOUT1 Mixer", "LINL4", "LIN4 Mixing Circuit"},
         {"ROUT1 Mixer", "RINR4", "RIN4 Mixing Circuit"},
         {"LOUT2 Mixer", "LINH4", "LIN4 Mixing Circuit"},
         {"ROUT2 Mixer", "RINH4", "RIN4 Mixing Circuit"},
         {"LOUT3 Mixer", "LINS4", "LIN4 Mixing Circuit"},
         {"ROUT3 Mixer", "RINS4", "RIN4 Mixing Circuit"},
 };
 
 static int ak4671_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, ak4671_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, ak4671_dapm_widgets,
                                   ARRAY_SIZE(ak4671_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 ak4671_hw_params(struct snd_pcm_substream *substream,
                 struct snd_pcm_hw_params *params,
                 struct snd_soc_dai *dai)
 {
         struct snd_soc_codec *codec = dai->codec;
         u8 fs;
@@ skipping 141 matching lines @@
         case SND_SOC_BIAS_PREPARE:
         case SND_SOC_BIAS_STANDBY:
                 reg = snd_soc_read(codec, AK4671_AD_DA_POWER_MANAGEMENT);
                 snd_soc_write(codec, AK4671_AD_DA_POWER_MANAGEMENT,
                                 reg | AK4671_PMVCM);
                 break;
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, AK4671_AD_DA_POWER_MANAGEMENT, 0x00);
                 break;
         }
-        codec->bias_level = level;
+        codec->dapm.bias_level = level;
         return 0;
 }
 
 #define AK4671_RATES            (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
                                 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 |\
                                 SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 |\
                                 SNDRV_PCM_RATE_48000)
 
 #define AK4671_FORMATS          SNDRV_PCM_FMTBIT_S16_LE
 
@@ skipping 109 matching lines @@
 
 static void __exit ak4671_exit(void)
 {
         i2c_del_driver(&ak4671_i2c_driver);
 }
 module_exit(ak4671_exit);
 
 MODULE_DESCRIPTION("ASoC AK4671 codec driver");
 MODULE_AUTHOR("Joonyoung Shim <jy0922.shim@samsung.com>");
 MODULE_LICENSE("GPL");