CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/codecs/cx20442.c

 /*
  * cx20442.c  --  CX20442 ALSA Soc Audio driver
  *
  * Copyright 2009 Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
  *
  * Initially based on sound/soc/codecs/wm8400.c
  * Copyright 2008, 2009 Wolfson Microelectronics PLC.
  * Author: Mark Brown <broonie@opensource.wolfsonmicro.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/tty.h>
 #include <linux/slab.h>
 
 #include <sound/core.h>
 #include <sound/initval.h>
-#include <sound/soc-dapm.h>
+#include <sound/soc.h>
 
 #include "cx20442.h"
 
 
 struct cx20442_priv {
         enum snd_soc_control_type control_type;
         void *control_data;
-        u8 reg_cache[1];
 };
 
 #define CX20442_PM              0x0
 
 #define CX20442_TELIN           0
 #define CX20442_TELOUT          1
 #define CX20442_MIC             2
 #define CX20442_SPKOUT          3
 #define CX20442_AGC             4
 
@@ skipping 42 matching lines @@
         {"Input Mixer", NULL, "MIC Bias"},
 
         {"TELIN Bias", NULL, "TELIN"},
         {"Input Mixer", NULL, "TELIN Bias"},
 
         {"ADC", NULL, "Input Mixer"},
 };
 
 static int cx20442_add_widgets(struct snd_soc_codec *codec)
 {
-        snd_soc_dapm_new_controls(codec, cx20442_dapm_widgets,
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+        snd_soc_dapm_new_controls(dapm, cx20442_dapm_widgets,
                                   ARRAY_SIZE(cx20442_dapm_widgets));
-
-        snd_soc_dapm_add_routes(codec, cx20442_audio_map,
+        snd_soc_dapm_add_routes(dapm, cx20442_audio_map,
                                 ARRAY_SIZE(cx20442_audio_map));
 
         return 0;
 }
 
 static unsigned int cx20442_read_reg_cache(struct snd_soc_codec *codec,
                                                         unsigned int reg)
 {
         u8 *reg_cache = codec->reg_cache;
 
@@ skipping 150 matching lines @@
         tty->disc_data = NULL;
 
         if (!codec)
                 return;
 
         cx20442 = snd_soc_codec_get_drvdata(codec);
 
         /* Prevent the codec driver from further accessing the modem */
         codec->hw_write = NULL;
         cx20442->control_data = NULL;
-        codec->pop_time = 0;
+        codec->card->pop_time = 0;
 }
 
 /* Line discipline .hangup() */
 static int v253_hangup(struct tty_struct *tty)
 {
         v253_close(tty);
         return 0;
 }
 
 /* Line discipline .receive_buf() */
 static void v253_receive(struct tty_struct *tty,
                                 const unsigned char *cp, char *fp, int count)
 {
         struct snd_soc_codec *codec = tty->disc_data;
         struct cx20442_priv *cx20442;
 
         if (!codec)
                 return;
 
         cx20442 = snd_soc_codec_get_drvdata(codec);
 
         if (!cx20442->control_data) {
                 /* First modem response, complete setup procedure */
 
                 /* Set up codec driver access to modem controls */
                 cx20442->control_data = tty;
                 codec->hw_write = (hw_write_t)tty->ops->write;
-                codec->pop_time = 1;
+                codec->card->pop_time = 1;
         }
 }
 
 /* Line discipline .write_wakeup() */
 static void v253_wakeup(struct tty_struct *tty)
 {
 }
 
 struct tty_ldisc_ops v253_ops = {
         .magic = TTY_LDISC_MAGIC,
@@ skipping 36 matching lines @@
 
         cx20442 = kzalloc(sizeof(struct cx20442_priv), GFP_KERNEL);
         if (cx20442 == NULL)
                 return -ENOMEM;
         snd_soc_codec_set_drvdata(codec, cx20442);
 
         cx20442_add_widgets(codec);
 
         cx20442->control_data = NULL;
         codec->hw_write = NULL;
-        codec->pop_time = 0;
+        codec->card->pop_time = 0;
 
         return 0;
 }
 
 /* power down chip */
 static int cx20442_codec_remove(struct snd_soc_codec *codec)
 {
         struct cx20442_priv *cx20442 = snd_soc_codec_get_drvdata(codec);
 
         if (cx20442->control_data) {
                         struct tty_struct *tty = cx20442->control_data;
                         tty_hangup(tty);
         }
 
         kfree(cx20442);
         return 0;
 }
 
+static const u8 cx20442_reg;
+
 static struct snd_soc_codec_driver cx20442_codec_dev = {
         .probe =        cx20442_codec_probe,
         .remove =       cx20442_codec_remove,
+        .reg_cache_default = &cx20442_reg,
         .reg_cache_size = 1,
         .reg_word_size = sizeof(u8),
         .read = cx20442_read_reg_cache,
         .write = cx20442_write,
 };
 
 static int cx20442_platform_probe(struct platform_device *pdev)
 {
         return snd_soc_register_codec(&pdev->dev,
                         &cx20442_codec_dev, &cx20442_dai, 1);
@@ skipping 23 matching lines @@
 static void __exit cx20442_exit(void)
 {
         platform_driver_unregister(&cx20442_platform_driver);
 }
 module_exit(cx20442_exit);
 
 MODULE_DESCRIPTION("ASoC CX20442-11 voice modem codec driver");
 MODULE_AUTHOR("Janusz Krzysztofik");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:cx20442-codec");