CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/ad193x.c

 /*
  * AD193X Audio Codec driver supporting AD1936/7/8/9
  *
  * Copyright 2010 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
 
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/i2c.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/initval.h>
 #include <sound/soc.h>
 #include <sound/tlv.h>
-#include <sound/soc-dapm.h>
 #include "ad193x.h"
 
 /* codec private data */
 struct ad193x_priv {
-        u8 reg_cache[AD193X_NUM_REGS];
         enum snd_soc_control_type bus_type;
         void *control_data;
         int sysclk;
 };
 
 /* ad193x register cache & default register settings */
 static const u8 ad193x_reg[AD193X_NUM_REGS] = {
         0, 0, 0, 0, 0, 0, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0, 0, 0,
 };
 
@@ skipping 308 matching lines @@
                 .rates = SNDRV_PCM_RATE_48000,
                 .formats = SNDRV_PCM_FMTBIT_S32_LE | SNDRV_PCM_FMTBIT_S16_LE |
                         SNDRV_PCM_FMTBIT_S20_3LE | SNDRV_PCM_FMTBIT_S24_LE,
         },
         .ops = &ad193x_dai_ops,
 };
 
 static int ad193x_probe(struct snd_soc_codec *codec)
 {
         struct ad193x_priv *ad193x = snd_soc_codec_get_drvdata(codec);
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         codec->control_data = ad193x->control_data;
         if (ad193x->bus_type == SND_SOC_I2C)
                 ret = snd_soc_codec_set_cache_io(codec, 8, 8, ad193x->bus_type);
         else
                 ret = snd_soc_codec_set_cache_io(codec, 16, 8, ad193x->bus_type);
         if (ret < 0) {
                 dev_err(codec->dev, "failed to set cache I/O: %d\n",
                                 ret);
-                kfree(ad193x);
                 return ret;
         }
 
         /* default setting for ad193x */
 
         /* unmute dac channels */
         snd_soc_write(codec, AD193X_DAC_CHNL_MUTE, 0x0);
         /* de-emphasis: 48kHz, powedown dac */
         snd_soc_write(codec, AD193X_DAC_CTRL2, 0x1A);
         /* powerdown dac, dac in tdm mode */
         snd_soc_write(codec, AD193X_DAC_CTRL0, 0x41);
         /* high-pass filter enable */
         snd_soc_write(codec, AD193X_ADC_CTRL0, 0x3);
         /* sata delay=1, adc aux mode */
         snd_soc_write(codec, AD193X_ADC_CTRL1, 0x43);
         /* pll input: mclki/xi */
         snd_soc_write(codec, AD193X_PLL_CLK_CTRL0, 0x99); /* mclk=24.576Mhz: 0x9D; mclk=12.288Mhz: 0x99 */
         snd_soc_write(codec, AD193X_PLL_CLK_CTRL1, 0x04);
 
         snd_soc_add_controls(codec, ad193x_snd_controls,
                              ARRAY_SIZE(ad193x_snd_controls));
-        snd_soc_dapm_new_controls(codec, ad193x_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, ad193x_dapm_widgets,
                                   ARRAY_SIZE(ad193x_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, audio_paths, ARRAY_SIZE(audio_paths));
+        snd_soc_dapm_add_routes(dapm, audio_paths, ARRAY_SIZE(audio_paths));
 
         return ret;
 }
 
 static struct snd_soc_codec_driver soc_codec_dev_ad193x = {
         .probe =        ad193x_probe,
         .reg_cache_default = ad193x_reg,
         .reg_cache_size = AD193X_NUM_REGS,
         .reg_word_size = sizeof(u16),
 };
@@ skipping 113 matching lines @@
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
         i2c_del_driver(&ad193x_i2c_driver);
 #endif
 }
 module_exit(ad193x_modexit);
 
 MODULE_DESCRIPTION("ASoC ad193x driver");
 MODULE_AUTHOR("Barry Song <21cnbao@gmail.com>");
 MODULE_LICENSE("GPL");