CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/omap/n810.c

 /*
  * n810.c  --  SoC audio for Nokia N810
  *
  * Copyright (C) 2008 Nokia Corporation
  *
  * Contact: Jarkko Nikula <jhnikula@gmail.com>
  *
  * 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.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA
  *
  */
 
 #include <linux/clk.h>
 #include <linux/i2c.h>
 #include <linux/platform_device.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/hardware.h>
 #include <linux/gpio.h>
 #include <plat/mcbsp.h>
 
 #include "omap-mcbsp.h"
 #include "omap-pcm.h"
-#include "../codecs/tlv320aic3x.h"
 
 #define N810_HEADSET_AMP_GPIO   10
 #define N810_SPEAKER_AMP_GPIO   101
 
 enum {
         N810_JACK_DISABLED,
         N810_JACK_HP,
         N810_JACK_HS,
         N810_JACK_MIC,
 };
 
 static struct clk *sys_clkout2;
 static struct clk *sys_clkout2_src;
 static struct clk *func96m_clk;
 
 static int n810_spk_func;
 static int n810_jack_func;
 static int n810_dmic_func;
 
 static void n810_ext_control(struct snd_soc_codec *codec)
 {
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int hp = 0, line1l = 0;
 
         switch (n810_jack_func) {
         case N810_JACK_HS:
                 line1l = 1;
         case N810_JACK_HP:
                 hp = 1;
                 break;
         case N810_JACK_MIC:
                 line1l = 1;
                 break;
         }
 
         if (n810_spk_func)
-                snd_soc_dapm_enable_pin(codec, "Ext Spk");
+                snd_soc_dapm_enable_pin(dapm, "Ext Spk");
         else
-                snd_soc_dapm_disable_pin(codec, "Ext Spk");
+                snd_soc_dapm_disable_pin(dapm, "Ext Spk");
 
         if (hp)
-                snd_soc_dapm_enable_pin(codec, "Headphone Jack");
+                snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
         else
-                snd_soc_dapm_disable_pin(codec, "Headphone Jack");
+                snd_soc_dapm_disable_pin(dapm, "Headphone Jack");
         if (line1l)
-                snd_soc_dapm_enable_pin(codec, "LINE1L");
+                snd_soc_dapm_enable_pin(dapm, "LINE1L");
         else
-                snd_soc_dapm_disable_pin(codec, "LINE1L");
+                snd_soc_dapm_disable_pin(dapm, "LINE1L");
 
         if (n810_dmic_func)
-                snd_soc_dapm_enable_pin(codec, "DMic");
+                snd_soc_dapm_enable_pin(dapm, "DMic");
         else
-                snd_soc_dapm_disable_pin(codec, "DMic");
+                snd_soc_dapm_disable_pin(dapm, "DMic");
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 }
 
 static int n810_startup(struct snd_pcm_substream *substream)
 {
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_codec *codec = rtd->codec;
 
         snd_pcm_hw_constraint_minmax(runtime,
                                      SNDRV_PCM_HW_PARAM_CHANNELS, 2, 2);
@@ skipping 163 matching lines @@
                      n810_get_spk, n810_set_spk),
         SOC_ENUM_EXT("Jack Function", n810_enum[1],
                      n810_get_jack, n810_set_jack),
         SOC_ENUM_EXT("Input Select",  n810_enum[2],
                      n810_get_input, n810_set_input),
 };
 
 static int n810_aic33_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int err;
 
         /* Not connected */
-        snd_soc_dapm_nc_pin(codec, "MONO_LOUT");
-        snd_soc_dapm_nc_pin(codec, "HPLCOM");
-        snd_soc_dapm_nc_pin(codec, "HPRCOM");
-        snd_soc_dapm_nc_pin(codec, "MIC3L");
-        snd_soc_dapm_nc_pin(codec, "MIC3R");
-        snd_soc_dapm_nc_pin(codec, "LINE1R");
-        snd_soc_dapm_nc_pin(codec, "LINE2L");
-        snd_soc_dapm_nc_pin(codec, "LINE2R");
+        snd_soc_dapm_nc_pin(dapm, "MONO_LOUT");
+        snd_soc_dapm_nc_pin(dapm, "HPLCOM");
+        snd_soc_dapm_nc_pin(dapm, "HPRCOM");
+        snd_soc_dapm_nc_pin(dapm, "MIC3L");
+        snd_soc_dapm_nc_pin(dapm, "MIC3R");
+        snd_soc_dapm_nc_pin(dapm, "LINE1R");
+        snd_soc_dapm_nc_pin(dapm, "LINE2L");
+        snd_soc_dapm_nc_pin(dapm, "LINE2R");
 
         /* Add N810 specific controls */
         err = snd_soc_add_controls(codec, aic33_n810_controls,
                                 ARRAY_SIZE(aic33_n810_controls));
         if (err < 0)
                 return err;
 
         /* Add N810 specific widgets */
-        snd_soc_dapm_new_controls(codec, aic33_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, aic33_dapm_widgets,
                                   ARRAY_SIZE(aic33_dapm_widgets));
 
         /* Set up N810 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));
 
-        snd_soc_dapm_sync(codec);
+        snd_soc_dapm_sync(dapm);
 
         return 0;
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link n810_dai = {
         .name = "TLV320AIC33",
         .stream_name = "AIC33",
         .cpu_dai_name = "omap-mcbsp-dai.1",
         .platform_name = "omap-pcm-audio",
@@ skipping 85 matching lines @@
 
         platform_device_unregister(n810_snd_device);
 }
 
 module_init(n810_soc_init);
 module_exit(n810_soc_exit);
 
 MODULE_AUTHOR("Jarkko Nikula <jhnikula@gmail.com>");
 MODULE_DESCRIPTION("ALSA SoC Nokia N810");
 MODULE_LICENSE("GPL");