CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/e800_wm9712.c

 /*
  * e800-wm9712.c  --  SoC audio for e800
  *
  * Copyright 2007 (c) Ian Molton <spyro@f2s.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; version 2 ONLY.
  *
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/gpio.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/audio.h>
 #include <mach/eseries-gpio.h>
 
 #include "../codecs/wm9712.h"
 #include "pxa2xx-ac97.h"
 
 static int e800_spk_amp_event(struct snd_soc_dapm_widget *w,
                                 struct snd_kcontrol *kcontrol, int event)
@@ skipping 38 matching lines @@
         {"Speaker Amp", NULL, "MONOOUT"},
         {"Speaker", NULL, "Speaker Amp"},
 
         {"MIC1", NULL, "Mic (Internal1)"},
         {"MIC2", NULL, "Mic (Internal2)"},
 };
 
 static int e800_ac97_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, e800_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, e800_dapm_widgets,
                                         ARRAY_SIZE(e800_dapm_widgets));
 
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
 
 static struct snd_soc_dai_link e800_dai[] = {
         {
                 .name = "AC97",
                 .stream_name = "AC97 HiFi",
                 .cpu_dai_name = "pxa-ac97.0",
                 .codec_dai_name = "wm9712-hifi",
@@ skipping 69 matching lines @@
         gpio_free(GPIO_E800_HP_AMP_OFF);
 }
 
 module_init(e800_init);
 module_exit(e800_exit);
 
 /* Module information */
 MODULE_AUTHOR("Ian Molton <spyro@f2s.com>");
 MODULE_DESCRIPTION("ALSA SoC driver for e800");
 MODULE_LICENSE("GPL v2");