CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/atmel/playpaq_wm8510.c

 /* sound/soc/at32/playpaq_wm8510.c
  * ASoC machine driver for PlayPaq using WM8510 codec
  *
  * Copyright (C) 2008 Long Range Systems
  *    Geoffrey Wossum <gwossum@acm.org>
  *
  * 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.
  *
@@ skipping 15 matching lines @@
 #include <linux/errno.h>
 #include <linux/clk.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <mach/at32ap700x.h>
 #include <mach/portmux.h>
 
 #include "../codecs/wm8510.h"
 #include "atmel-pcm.h"
 #include "atmel_ssc_dai.h"
 
 
 /*-------------------------------------------------------------------------*\
@@ skipping 264 matching lines @@
         {"Mic Bias", NULL, "Int Mic"},
         {"MICN", NULL, "Mic Bias"},
         {"MICP", NULL, "Mic Bias"},
 };
 
 
 
 static int playpaq_wm8510_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int i;
 
         /*
          * Add DAPM widgets
          */
         for (i = 0; i < ARRAY_SIZE(playpaq_dapm_widgets); i++)
-                snd_soc_dapm_new_control(codec, &playpaq_dapm_widgets[i]);
+                snd_soc_dapm_new_control(dapm, &playpaq_dapm_widgets[i]);
 
 
 
         /*
          * Setup audio path interconnects
          */
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
 
 
         /* always connected pins */
-        snd_soc_dapm_enable_pin(codec, "Int Mic");
-        snd_soc_dapm_enable_pin(codec, "Ext Spk");
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_enable_pin(dapm, "Int Mic");
+        snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+        snd_soc_dapm_sync(dapm);
 
 
 
         /* Make CSB show PLL rate */
         snd_soc_dai_set_clkdiv(rtd->codec_dai, WM8510_OPCLKDIV,
                                        WM8510_OPCLKDIV_1 | 4);
 
         return 0;
 }
 
@@ skipping 110 matching lines @@
         platform_device_unregister(playpaq_snd_device);
         playpaq_snd_device = NULL;
 }
 
 module_init(playpaq_asoc_init);
 module_exit(playpaq_asoc_exit);
 
 MODULE_AUTHOR("Geoffrey Wossum <gwossum@acm.org>");
 MODULE_DESCRIPTION("ASoC machine driver for LRS PlayPaq");
 MODULE_LICENSE("GPL");