CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/omap/am3517evm.c

 /*
  * am3517evm.c  -- ALSA SoC support for OMAP3517 / AM3517 EVM
  *
  * Author: Anuj Aggarwal <anuj.aggarwal@ti.com>
  *
  * Based on sound/soc/omap/beagle.c by Steve Sakoman
  *
  * Copyright (C) 2009 Texas Instruments Incorporated
  *
  * 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 version 2.
  *
  * This program is distributed "as is" WITHOUT ANY WARRANTY of any kind,
  * whether express or implied; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
  * General Public License for more details.
  */
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
 #include <plat/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
 
 #include "../codecs/tlv320aic23.h"
@@ skipping 71 matching lines @@
 
         {"LLINEIN", NULL, "Line In"},
         {"RLINEIN", NULL, "Line In"},
 
         {"MICIN", NULL, "Mic In"},
 };
 
 static int am3517evm_aic23_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
         /* Add am3517-evm 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 davinci-evm 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));
 
         /* always connected */
-        snd_soc_dapm_enable_pin(codec, "Line Out");
-        snd_soc_dapm_enable_pin(codec, "Line In");
-        snd_soc_dapm_enable_pin(codec, "Mic In");
+        snd_soc_dapm_enable_pin(dapm, "Line Out");
+        snd_soc_dapm_enable_pin(dapm, "Line In");
+        snd_soc_dapm_enable_pin(dapm, "Mic In");
 
-        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 am3517evm_dai = {
         .name = "TLV320AIC23",
         .stream_name = "AIC23",
         .cpu_dai_name ="omap-mcbsp-dai.0",
         .codec_dai_name = "tlv320aic23-hifi",
@@ skipping 45 matching lines @@
 {
         platform_device_unregister(am3517evm_snd_device);
 }
 
 module_init(am3517evm_soc_init);
 module_exit(am3517evm_soc_exit);
 
 MODULE_AUTHOR("Anuj Aggarwal <anuj.aggarwal@ti.com>");
 MODULE_DESCRIPTION("ALSA SoC OMAP3517 / AM3517 EVM");
 MODULE_LICENSE("GPL v2");