CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/tavorevb3.c

 /*
  * tavorevb3.c -- SoC audio for Tavor EVB3
  *
  * Copyright (C) 2010 Marvell International Ltd.
  *      Haojian Zhuang <haojian.zhuang@marvell.com>
  *
  * 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.
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/device.h>
 #include <linux/clk.h>
 #include <linux/i2c.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
 
 #include "../codecs/88pm860x-codec.h"
 #include "pxa-ssp.h"
 
 static int evb3_pm860x_init(struct snd_soc_pcm_runtime *rtd);
 
 static struct platform_device *evb3_snd_device;
@@ skipping 94 matching lines @@
 
 static struct snd_soc_card snd_soc_card_evb3 = {
         .name = "Tavor EVB3",
         .dai_link = evb3_dai,
         .num_links = ARRAY_SIZE(evb3_dai),
 };
 
 static int evb3_pm860x_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
-        snd_soc_dapm_new_controls(codec, evb3_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, evb3_dapm_widgets,
                                   ARRAY_SIZE(evb3_dapm_widgets));
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         /* connected pins */
-        snd_soc_dapm_enable_pin(codec, "Ext Speaker");
-        snd_soc_dapm_enable_pin(codec, "Ext Mic 1");
-        snd_soc_dapm_enable_pin(codec, "Ext Mic 3");
-        snd_soc_dapm_disable_pin(codec, "Headset Mic 2");
-        snd_soc_dapm_disable_pin(codec, "Headset Stereophone");
+        snd_soc_dapm_enable_pin(dapm, "Ext Speaker");
+        snd_soc_dapm_enable_pin(dapm, "Ext Mic 1");
+        snd_soc_dapm_enable_pin(dapm, "Ext Mic 3");
+        snd_soc_dapm_disable_pin(dapm, "Headset Mic 2");
+        snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
 
-        ret = snd_soc_dapm_sync(codec);
+        ret = snd_soc_dapm_sync(dapm);
         if (ret)
                 return ret;
 
         /* Headset jack detection */
         snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE
                         | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2,
                         &hs_jack);
         snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
                               hs_jack_pins);
         snd_soc_jack_new(codec, "Microphone Jack", SND_JACK_MICROPHONE,
@@ skipping 31 matching lines @@
 {
         platform_device_unregister(evb3_snd_device);
 }
 
 module_init(tavorevb3_init);
 module_exit(tavorevb3_exit);
 
 MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
 MODULE_DESCRIPTION("ALSA SoC 88PM860x Tavor EVB3");
 MODULE_LICENSE("GPL");