CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/sh/migor.c

 /*
  * ALSA SoC driver for Migo-R
  *
  * Copyright (C) 2009-2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  *
  * 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/clkdev.h>
 #include <linux/device.h>
 #include <linux/firmware.h>
 #include <linux/module.h>
 
-#include <asm/clkdev.h>
 #include <asm/clock.h>
 
 #include <cpu/sh7722.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include "../codecs/wm8978.h"
 #include "siu.h"
 
 /* Default 8000Hz sampling frequency */
 static unsigned long codec_freq = 8000 * 512;
 
 static unsigned int use_count;
 
 /* External clock, sourced from the codec at the SIUMCKB pin */
@@ skipping 99 matching lines @@
 
         /* External microphone */
         { "LMICN", NULL, "Mic Bias" },
         { "LMICP", NULL, "Mic Bias" },
         { "Mic Bias", NULL, "External Microphone" },
 };
 
 static int migor_dai_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, migor_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, migor_dapm_widgets,
                                   ARRAY_SIZE(migor_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));
 
         return 0;
 }
 
 /* migor digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link migor_dai = {
         .name = "wm8978",
         .stream_name = "WM8978",
         .cpu_dai_name = "siu-i2s-dai",
         .codec_dai_name = "wm8978-hifi",
@@ skipping 57 matching lines @@
         clk_unregister(&siumckb_clk);
         platform_device_unregister(migor_snd_device);
 }
 
 module_init(migor_init);
 module_exit(migor_exit);
 
 MODULE_AUTHOR("Guennadi Liakhovetski <g.liakhovetski@gmx.de>");
 MODULE_DESCRIPTION("ALSA SoC Migor");
 MODULE_LICENSE("GPL v2");