CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/atmel/snd-soc-afeb9260.c

 /*
  * afeb9260.c  --  SoC audio for AFEB9260
  *
  * Copyright (C) 2009 Sergey Lapin <slapin@ossfans.org>
  *
  * 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
@@ skipping 12 matching lines @@
 #include <linux/moduleparam.h>
 #include <linux/kernel.h>
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 
 #include <linux/atmel-ssc.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <linux/gpio.h>
 
 #include "../codecs/tlv320aic23.h"
 #include "atmel-pcm.h"
 #include "atmel_ssc_dai.h"
 
 #define CODEC_CLOCK     12000000
@@ skipping 54 matching lines @@
 
         {"LLINEIN", NULL, "Line In"},
         {"RLINEIN", NULL, "Line In"},
 
         {"MICIN", NULL, "Mic Jack"},
 };
 
 static int afeb9260_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         /* Add afeb9260 specific widgets */
-        snd_soc_dapm_new_controls(codec, tlv320aic23_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, tlv320aic23_dapm_widgets,
                                   ARRAY_SIZE(tlv320aic23_dapm_widgets));
 
         /* Set up afeb9260 specific audio path audio_map */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
-        snd_soc_dapm_enable_pin(codec, "Headphone Jack");
-        snd_soc_dapm_enable_pin(codec, "Line In");
-        snd_soc_dapm_enable_pin(codec, "Mic Jack");
+        snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
+        snd_soc_dapm_enable_pin(dapm, "Line In");
+        snd_soc_dapm_enable_pin(dapm, "Mic Jack");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link afeb9260_dai = {
         .name = "TLV320AIC23",
         .stream_name = "AIC23",
         .cpu_dai_name = "atmel-ssc-dai.0",
         .codec_dai_name = "tlv320aic23-hifi",
         .platform_name = "atmel_pcm-audio",
-        .codec_name = "tlv320aic23-codec.0-0x1a",
+        .codec_name = "tlv320aic23-codec.0-001a",
         .init = afeb9260_tlv320aic23_init,
         .ops = &afeb9260_ops,
 };
 
 /* Audio machine driver */
 static struct snd_soc_card snd_soc_machine_afeb9260 = {
         .name = "AFEB9260",
         .dai_link = &afeb9260_dai,
         .num_links = 1,
 };
@@ skipping 33 matching lines @@
         platform_device_unregister(afeb9260_snd_device);
 }
 
 module_init(afeb9260_soc_init);
 module_exit(afeb9260_soc_exit);
 
 MODULE_AUTHOR("Sergey Lapin <slapin@ossfans.org>");
 MODULE_DESCRIPTION("ALSA SoC for AFEB9260");
 MODULE_LICENSE("GPL");