CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/cs42l51.c

 /*
  * cs42l51.c
  *
  * ASoC Driver for Cirrus Logic CS42L51 codecs
  *
  * Copyright (c) 2010 Arnaud Patard <apatard@mandriva.com>
  *
  * Based on cs4270.c - Copyright (c) Freescale Semiconductor
  *
  * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * For now:
  *  - Only I2C is support. Not SPI
  *  - master mode *NOT* supported
  */
 
 #include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <sound/initval.h>
 #include <sound/pcm_params.h>
 #include <sound/pcm.h>
 #include <linux/i2c.h>
 
 #include "cs42l51.h"
 
 enum master_slave_mode {
         MODE_SLAVE,
         MODE_SLAVE_AUTO,
         MODE_MASTER,
 };
 
 struct cs42l51_private {
         enum snd_soc_control_type control_type;
         void *control_data;
         unsigned int mclk;
         unsigned int audio_mode;        /* The mode (I2S or left-justified) */
         enum master_slave_mode func;
-        u8 reg_cache[CS42L51_NUMREGS];
 };
 
 #define CS42L51_FORMATS ( \
                 SNDRV_PCM_FMTBIT_S16_LE  | SNDRV_PCM_FMTBIT_S16_BE  | \
                 SNDRV_PCM_FMTBIT_S18_3LE | SNDRV_PCM_FMTBIT_S18_3BE | \
                 SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S20_3BE | \
                 SNDRV_PCM_FMTBIT_S24_LE  | SNDRV_PCM_FMTBIT_S24_BE)
 
 static int cs42l51_fill_cache(struct snd_soc_codec *codec)
 {
@@ skipping 451 matching lines @@
                 .channels_max = 2,
                 .rates = SNDRV_PCM_RATE_8000_96000,
                 .formats = CS42L51_FORMATS,
         },
         .ops = &cs42l51_dai_ops,
 };
 
 static int cs42l51_probe(struct snd_soc_codec *codec)
 {
         struct cs42l51_private *cs42l51 = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret, reg;
 
         codec->control_data = cs42l51->control_data;
 
         ret = cs42l51_fill_cache(codec);
         if (ret < 0) {
                 dev_err(codec->dev, "failed to fill register cache\n");
                 return ret;
         }
 
@@ skipping 11 matching lines @@
          * - no de-emphasize
          */
         reg = CS42L51_DAC_CTL_DATA_SEL(1)
                 | CS42L51_DAC_CTL_AMUTE | CS42L51_DAC_CTL_DACSZ(0);
         ret = snd_soc_write(codec, CS42L51_DAC_CTL, reg);
         if (ret < 0)
                 return ret;
 
         snd_soc_add_controls(codec, cs42l51_snd_controls,
                 ARRAY_SIZE(cs42l51_snd_controls));
-        snd_soc_dapm_new_controls(codec, cs42l51_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, cs42l51_dapm_widgets,
                 ARRAY_SIZE(cs42l51_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, cs42l51_routes,
+        snd_soc_dapm_add_routes(dapm, cs42l51_routes,
                 ARRAY_SIZE(cs42l51_routes));
 
         return 0;
 }
 
 static struct snd_soc_codec_driver soc_codec_device_cs42l51 = {
         .probe =        cs42l51_probe,
         .reg_cache_size = CS42L51_NUMREGS,
         .reg_word_size = sizeof(u8),
 };
@@ skipping 79 matching lines @@
 
 static void __exit cs42l51_exit(void)
 {
         i2c_del_driver(&cs42l51_i2c_driver);
 }
 module_exit(cs42l51_exit);
 
 MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
 MODULE_DESCRIPTION("Cirrus Logic CS42L51 ALSA SoC Codec Driver");
 MODULE_LICENSE("GPL");