CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/omap/sdp3430.c

 /*
  * sdp3430.c  --  SoC audio for TI OMAP3430 SDP
  *
  * Author: Misael Lopez Cruz <x0052729@ti.com>
  *
  * Based on:
  * Author: Steve Sakoman <steve@sakoman.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ skipping 10 matching lines @@
  * 02110-1301 USA
  *
  */
 
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/i2c/twl.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
-#include <sound/soc-dapm.h>
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>
 #include <mach/hardware.h>
 #include <mach/gpio.h>
 #include <plat/mcbsp.h>
 
 /* Register descriptions for twl4030 codec part */
 #include <linux/mfd/twl4030-codec.h>
 
@@ skipping 142 matching lines @@
         {"Headset Mic Bias", NULL, "Headset Mic"},
 
         /* Headset Stereophone (Headphone): HSOL, HSOR */
         {"Headset Stereophone", NULL, "HSOL"},
         {"Headset Stereophone", NULL, "HSOR"},
 };
 
 static int sdp3430_twl4030_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         /* Add SDP3430 specific widgets */
-        ret = snd_soc_dapm_new_controls(codec, sdp3430_twl4030_dapm_widgets,
+        ret = snd_soc_dapm_new_controls(dapm, sdp3430_twl4030_dapm_widgets,
                                 ARRAY_SIZE(sdp3430_twl4030_dapm_widgets));
         if (ret)
                 return ret;
 
         /* Set up SDP3430 specific audio path audio_map */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
         /* SDP3430 connected pins */
-        snd_soc_dapm_enable_pin(codec, "Ext Mic");
-        snd_soc_dapm_enable_pin(codec, "Ext Spk");
-        snd_soc_dapm_disable_pin(codec, "Headset Mic");
-        snd_soc_dapm_disable_pin(codec, "Headset Stereophone");
+        snd_soc_dapm_enable_pin(dapm, "Ext Mic");
+        snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+        snd_soc_dapm_disable_pin(dapm, "Headset Mic");
+        snd_soc_dapm_disable_pin(dapm, "Headset Stereophone");
 
         /* TWL4030 not connected pins */
-        snd_soc_dapm_nc_pin(codec, "AUXL");
-        snd_soc_dapm_nc_pin(codec, "AUXR");
-        snd_soc_dapm_nc_pin(codec, "CARKITMIC");
-        snd_soc_dapm_nc_pin(codec, "DIGIMIC0");
-        snd_soc_dapm_nc_pin(codec, "DIGIMIC1");
+        snd_soc_dapm_nc_pin(dapm, "AUXL");
+        snd_soc_dapm_nc_pin(dapm, "AUXR");
+        snd_soc_dapm_nc_pin(dapm, "CARKITMIC");
+        snd_soc_dapm_nc_pin(dapm, "DIGIMIC0");
+        snd_soc_dapm_nc_pin(dapm, "DIGIMIC1");
 
-        snd_soc_dapm_nc_pin(codec, "OUTL");
-        snd_soc_dapm_nc_pin(codec, "OUTR");
-        snd_soc_dapm_nc_pin(codec, "EARPIECE");
-        snd_soc_dapm_nc_pin(codec, "PREDRIVEL");
-        snd_soc_dapm_nc_pin(codec, "PREDRIVER");
-        snd_soc_dapm_nc_pin(codec, "CARKITL");
-        snd_soc_dapm_nc_pin(codec, "CARKITR");
+        snd_soc_dapm_nc_pin(dapm, "OUTL");
+        snd_soc_dapm_nc_pin(dapm, "OUTR");
+        snd_soc_dapm_nc_pin(dapm, "EARPIECE");
+        snd_soc_dapm_nc_pin(dapm, "PREDRIVEL");
+        snd_soc_dapm_nc_pin(dapm, "PREDRIVER");
+        snd_soc_dapm_nc_pin(dapm, "CARKITL");
+        snd_soc_dapm_nc_pin(dapm, "CARKITR");
 
-        ret = snd_soc_dapm_sync(codec);
+        ret = snd_soc_dapm_sync(dapm);
         if (ret)
                 return ret;
 
         /* Headset jack detection */
         ret = snd_soc_jack_new(codec, "Headset Jack",
                                 SND_JACK_HEADSET, &hs_jack);
         if (ret)
                 return ret;
 
         ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
@@ skipping 99 matching lines @@
                                 hs_jack_gpios);
 
         platform_device_unregister(sdp3430_snd_device);
 }
 module_exit(sdp3430_soc_exit);
 
 MODULE_AUTHOR("Misael Lopez Cruz <x0052729@ti.com>");
 MODULE_DESCRIPTION("ALSA SoC SDP3430");
 MODULE_LICENSE("GPL");