CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/atmel/sam9g20_wm8731.c

 /*
  * sam9g20_wm8731  --  SoC audio for AT91SAM9G20-based
  *                      ATMEL AT91SAM9G20ek board.
  *
  *  Copyright (C) 2005 SAN People
  *  Copyright (C) 2008 Atmel
  *
  * Authors: Sedji Gaouaou <sedji.gaouaou@atmel.com>
  *
  * Based on ati_b1_wm8731.c by:
@@ skipping 26 matching lines @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/i2c.h>
 
 #include <linux/atmel-ssc.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
 
 #include "../codecs/wm8731.h"
 #include "atmel-pcm.h"
 #include "atmel_ssc_dai.h"
 
 #define MCLK_RATE 12000000
@@ skipping 75 matching lines @@
         {"Mic Bias", NULL, "Int Mic"},
 };
 
 /*
  * Logic for a wm8731 as connected on a at91sam9g20ek board.
  */
 static int at91sam9g20ek_wm8731_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
         struct snd_soc_dai *codec_dai = rtd->codec_dai;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         printk(KERN_DEBUG
                         "at91sam9g20ek_wm8731 "
                         ": at91sam9g20ek_wm8731_init() called\n");
 
         ret = snd_soc_dai_set_sysclk(codec_dai, WM8731_SYSCLK_XTAL,
                 MCLK_RATE, SND_SOC_CLOCK_IN);
         if (ret < 0) {
                 printk(KERN_ERR "Failed to set WM8731 SYSCLK: %d\n", ret);
                 return ret;
         }
 
         /* Add specific widgets */
-        snd_soc_dapm_new_controls(codec, at91sam9g20ek_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, at91sam9g20ek_dapm_widgets,
                                   ARRAY_SIZE(at91sam9g20ek_dapm_widgets));
         /* Set up specific audio path interconnects */
-        snd_soc_dapm_add_routes(codec, intercon, ARRAY_SIZE(intercon));
+        snd_soc_dapm_add_routes(dapm, intercon, ARRAY_SIZE(intercon));
 
         /* not connected */
-        snd_soc_dapm_nc_pin(codec, "RLINEIN");
-        snd_soc_dapm_nc_pin(codec, "LLINEIN");
+        snd_soc_dapm_nc_pin(dapm, "RLINEIN");
+        snd_soc_dapm_nc_pin(dapm, "LLINEIN");
 
 #ifdef ENABLE_MIC_INPUT
-        snd_soc_dapm_enable_pin(codec, "Int Mic");
+        snd_soc_dapm_enable_pin(dapm, "Int Mic");
 #else
-        snd_soc_dapm_nc_pin(codec, "Int Mic");
+        snd_soc_dapm_nc_pin(dapm, "Int Mic");
 #endif
 
         /* always connected */
-        snd_soc_dapm_enable_pin(codec, "Ext Spk");
+        snd_soc_dapm_enable_pin(dapm, "Ext Spk");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
 
 static struct snd_soc_dai_link at91sam9g20ek_dai = {
         .name = "WM8731",
         .stream_name = "WM8731 PCM",
         .cpu_dai_name = "atmel-ssc-dai.0",
         .codec_dai_name = "wm8731-hifi",
         .init = at91sam9g20ek_wm8731_init,
@@ skipping 85 matching lines @@
         mclk = NULL;
 }
 
 module_init(at91sam9g20ek_init);
 module_exit(at91sam9g20ek_exit);
 
 /* Module information */
 MODULE_AUTHOR("Sedji Gaouaou <sedji.gaouaou@atmel.com>");
 MODULE_DESCRIPTION("ALSA SoC AT91SAM9G20EK_WM8731");
 MODULE_LICENSE("GPL");