CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/imx/wm1133-ev1.c

 /*
  *  wm1133-ev1.c - Audio for WM1133-EV1 on i.MX31ADS
  *
  *  Copyright (c) 2010 Wolfson Microelectronics plc
  *  Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
  *
  *  Based on an earlier driver for the same hardware by Liam Girdwood.
  *
  *  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/platform_device.h>
 #include <linux/clk.h>
 #include <sound/core.h>
 #include <sound/jack.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <mach/audmux.h>
 
 #include "imx-ssi.h"
 #include "../codecs/wm8350.h"
 
 /* There is a silicon mic on the board optionally connected via a solder pad
  * SP1.  Define this to enable it.
  */
 #undef USE_SIMIC
@@ skipping 173 matching lines @@
 static struct snd_soc_jack mic_jack;
 
 static struct snd_soc_jack_pin mic_jack_pins[] = {
         { .pin = "Mic1 Jack", .mask = SND_JACK_MICROPHONE },
         { .pin = "Mic2 Jack", .mask = SND_JACK_MICROPHONE },
 };
 
 static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
 
-        snd_soc_dapm_new_controls(codec, wm1133_ev1_widgets,
+        snd_soc_dapm_new_controls(dapm, wm1133_ev1_widgets,
                                   ARRAY_SIZE(wm1133_ev1_widgets));
 
-        snd_soc_dapm_add_routes(codec, wm1133_ev1_map,
+        snd_soc_dapm_add_routes(dapm, wm1133_ev1_map,
                                 ARRAY_SIZE(wm1133_ev1_map));
 
         /* Headphone jack detection */
         snd_soc_jack_new(codec, "Headphone", SND_JACK_HEADPHONE, &hp_jack);
         snd_soc_jack_add_pins(&hp_jack, ARRAY_SIZE(hp_jack_pins),
                               hp_jack_pins);
         wm8350_hp_jack_detect(codec, WM8350_JDR, &hp_jack, SND_JACK_HEADPHONE);
 
         /* Microphone jack detection */
         snd_soc_jack_new(codec, "Microphone",
                          SND_JACK_MICROPHONE | SND_JACK_BTN_0, &mic_jack);
         snd_soc_jack_add_pins(&mic_jack, ARRAY_SIZE(mic_jack_pins),
                               mic_jack_pins);
         wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE,
                                SND_JACK_BTN_0);
 
-        snd_soc_dapm_force_enable_pin(codec, "Mic Bias");
+        snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
 
         return 0;
 }
 
 
 static struct snd_soc_dai_link wm1133_ev1_dai = {
         .name = "WM1133-EV1",
         .stream_name = "Audio",
         .cpu_dai_name = "imx-ssi.0",
         .codec_dai_name = "wm8350-hifi",
@@ skipping 46 matching lines @@
 
 static void __exit wm1133_ev1_audio_exit(void)
 {
         platform_device_unregister(wm1133_ev1_snd_device);
 }
 module_exit(wm1133_ev1_audio_exit);
 
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
 MODULE_DESCRIPTION("Audio for WM1133-EV1 on i.MX31ADS");
 MODULE_LICENSE("GPL");