CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/pxa/z2.c

 /*
  * linux/sound/soc/pxa/z2.c
  *
  * SoC Audio driver for Aeronix Zipit Z2
  *
  * Copyright (C) 2009 Ken McGuire <kenm@desertweyr.com>
  * Copyright (C) 2010 Marek Vasut <marek.vasut@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.
  */
 
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.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/audio.h>
 #include <mach/z2.h>
 
 #include "../codecs/wm8750.h"
 #include "pxa2xx-i2s.h"
 
@@ skipping 63 matching lines @@
         },
 };
 
 /* Headset jack detection gpios */
 static struct snd_soc_jack_gpio hs_jack_gpios[] = {
         {
                 .gpio           = GPIO37_ZIPITZ2_HEADSET_DETECT,
                 .name           = "hsdet-gpio",
                 .report         = SND_JACK_HEADSET,
                 .debounce_time  = 200,
+                .invert         = 1,
         },
 };
 
 /* z2 machine dapm widgets */
 static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = {
         SND_SOC_DAPM_HP("Headphone Jack", NULL),
         SND_SOC_DAPM_MIC("Mic Jack", NULL),
         SND_SOC_DAPM_SPK("Ext Spk", NULL),
 
         /* headset is a mic and mono headphone */
@@ skipping 15 matching lines @@
         {"RINPUT2", NULL, "Mic Bias"},
         {"Mic Bias", NULL, "Mic Jack"},
 };
 
 /*
  * Logic for a wm8750 as connected on a Z2 Device
  */
 static int z2_wm8750_init(struct snd_soc_pcm_runtime *rtd)
 {
         struct snd_soc_codec *codec = rtd->codec;
+        struct snd_soc_dapm_context *dapm = &codec->dapm;
         int ret;
 
         /* NC codec pins */
-        snd_soc_dapm_disable_pin(codec, "LINPUT3");
-        snd_soc_dapm_disable_pin(codec, "RINPUT3");
-        snd_soc_dapm_disable_pin(codec, "OUT3");
-        snd_soc_dapm_disable_pin(codec, "MONO");
+        snd_soc_dapm_disable_pin(dapm, "LINPUT3");
+        snd_soc_dapm_disable_pin(dapm, "RINPUT3");
+        snd_soc_dapm_disable_pin(dapm, "OUT3");
+        snd_soc_dapm_disable_pin(dapm, "MONO");
 
         /* Add z2 specific widgets */
-        snd_soc_dapm_new_controls(codec, wm8750_dapm_widgets,
+        snd_soc_dapm_new_controls(dapm, wm8750_dapm_widgets,
                                  ARRAY_SIZE(wm8750_dapm_widgets));
 
         /* Set up z2 specific audio paths */
-        snd_soc_dapm_add_routes(codec, audio_map, ARRAY_SIZE(audio_map));
+        snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map));
 
-        ret = snd_soc_dapm_sync(codec);
+        ret = snd_soc_dapm_sync(dapm);
         if (ret)
                 goto err;
 
         /* Jack detection API stuff */
         ret = snd_soc_jack_new(codec, "Headset Jack", SND_JACK_HEADSET,
                                 &hs_jack);
         if (ret)
                 goto err;
 
         ret = snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),
@@ skipping 16 matching lines @@
         .hw_params = z2_hw_params,
 };
 
 /* z2 digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link z2_dai = {
         .name           = "wm8750",
         .stream_name    = "WM8750",
         .cpu_dai_name   = "pxa2xx-i2s",
         .codec_dai_name = "wm8750-hifi",
         .platform_name = "pxa-pcm-audio",
-        .codec_name     = "wm8750-codec.0-001a",
+        .codec_name     = "wm8750-codec.0-001b",
         .init           = z2_wm8750_init,
         .ops            = &z2_ops,
 };
 
 /* z2 audio machine driver */
 static struct snd_soc_card snd_soc_z2 = {
         .name           = "Z2",
         .dai_link       = &z2_dai,
         .num_links      = 1,
 };
@@ skipping 25 matching lines @@
         platform_device_unregister(z2_snd_device);
 }
 
 module_init(z2_init);
 module_exit(z2_exit);
 
 MODULE_AUTHOR("Ken McGuire <kenm@desertweyr.com>, "
                 "Marek Vasut <marek.vasut@gmail.com>");
 MODULE_DESCRIPTION("ALSA SoC ZipitZ2");
 MODULE_LICENSE("GPL");