CHROMIUM: ASoC: Import entire upstream ASoC tree

sound/soc/omap/sdp4430.c

 /*
  * sdp4430.c  --  SoC audio for TI OMAP4430 SDP
  *
  * Author: Misael Lopez Cruz <x0052729@ti.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/platform_device.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 <plat/hardware.h>
 #include <plat/mux.h>
 
 #include "mcpdm.h"
 #include "omap-pcm.h"
 #include "../codecs/twl6040.h"
 
 static int twl6040_power_mode;
@@ skipping 21 matching lines @@
                 printk(KERN_ERR "can't set codec system clock\n");
                 return ret;
         }
         return ret;
 }
 
 static struct snd_soc_ops sdp4430_ops = {
         .hw_params = sdp4430_hw_params,
 };
 
+/* Headset jack */
+static struct snd_soc_jack hs_jack;
+
+/*Headset jack detection DAPM pins */
+static struct snd_soc_jack_pin hs_jack_pins[] = {
+        {
+                .pin = "Headset Mic",
+                .mask = SND_JACK_MICROPHONE,
+        },
+        {
+                .pin = "Headset Stereophone",
+                .mask = SND_JACK_HEADPHONE,
+        },
+};
+
 static int sdp4430_get_power_mode(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
         ucontrol->value.integer.value[0] = twl6040_power_mode;
         return 0;
 }
 
 static int sdp4430_set_power_mode(struct snd_kcontrol *kcontrol,
         struct snd_ctl_elem_value *ucontrol)
 {
@@ skipping 16 matching lines @@
                 sdp4430_get_power_mode, sdp4430_set_power_mode),
 };
 
 /* SDP4430 machine DAPM */
 static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = {
         SND_SOC_DAPM_MIC("Ext Mic", NULL),
         SND_SOC_DAPM_SPK("Ext Spk", NULL),
         SND_SOC_DAPM_MIC("Headset Mic", NULL),
         SND_SOC_DAPM_HP("Headset Stereophone", NULL),
         SND_SOC_DAPM_SPK("Earphone Spk", NULL),
+        SND_SOC_DAPM_INPUT("Aux/FM Stereo In"),
 };
 
 static const struct snd_soc_dapm_route audio_map[] = {
         /* External Mics: MAINMIC, SUBMIC with bias*/
         {"MAINMIC", NULL, "Main Mic Bias"},
         {"SUBMIC", NULL, "Main Mic Bias"},
         {"Main Mic Bias", NULL, "Ext Mic"},
 
         /* External Speakers: HFL, HFR */
         {"Ext Spk", NULL, "HFL"},
         {"Ext Spk", NULL, "HFR"},
 
         /* Headset Mic: HSMIC with bias */
         {"HSMIC", NULL, "Headset Mic Bias"},
         {"Headset Mic Bias", NULL, "Headset Mic"},
 
         /* Headset Stereophone (Headphone): HSOL, HSOR */
         {"Headset Stereophone", NULL, "HSOL"},
         {"Headset Stereophone", NULL, "HSOR"},
 
         /* Earphone speaker */
         {"Earphone Spk", NULL, "EP"},
+
+        /* Aux/FM Stereo In: AFML, AFMR */
+        {"AFML", NULL, "Aux/FM Stereo In"},
+        {"AFMR", NULL, "Aux/FM Stereo In"},
 };
 
 static int sdp4430_twl6040_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 SDP4430 specific controls */
         ret = snd_soc_add_controls(codec, sdp4430_controls,
                                 ARRAY_SIZE(sdp4430_controls));
         if (ret)
                 return ret;
 
         /* Add SDP4430 specific widgets */
-        ret = snd_soc_dapm_new_controls(codec, sdp4430_twl6040_dapm_widgets,
+        ret = snd_soc_dapm_new_controls(dapm, sdp4430_twl6040_dapm_widgets,
                                 ARRAY_SIZE(sdp4430_twl6040_dapm_widgets));
         if (ret)
                 return ret;
 
         /* Set up SDP4430 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));
 
         /* SDP4430 connected pins */
-        snd_soc_dapm_enable_pin(codec, "Ext Mic");
-        snd_soc_dapm_enable_pin(codec, "Ext Spk");
-        snd_soc_dapm_enable_pin(codec, "Headset Mic");
-        snd_soc_dapm_enable_pin(codec, "Headset Stereophone");
+        snd_soc_dapm_enable_pin(dapm, "Ext Mic");
+        snd_soc_dapm_enable_pin(dapm, "Ext Spk");
+        snd_soc_dapm_enable_pin(dapm, "AFML");
+        snd_soc_dapm_enable_pin(dapm, "AFMR");
+        snd_soc_dapm_enable_pin(dapm, "Headset Mic");
+        snd_soc_dapm_enable_pin(dapm, "Headset Stereophone");
 
-        /* TWL6040 not connected pins */
-        snd_soc_dapm_nc_pin(codec, "AFML");
-        snd_soc_dapm_nc_pin(codec, "AFMR");
+        ret = snd_soc_dapm_sync(dapm);
+        if (ret)
+                return ret;
 
-        ret = snd_soc_dapm_sync(codec);
+        /* 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),
+                                hs_jack_pins);
+
+        if (machine_is_omap_4430sdp())
+                twl6040_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADSET);
+        else
+                snd_soc_jack_report(&hs_jack, SND_JACK_HEADSET, SND_JACK_HEADSET);
 
         return ret;
 }
 
 /* Digital audio interface glue - connects codec <--> CPU */
 static struct snd_soc_dai_link sdp4430_dai = {
         .name = "TWL6040",
         .stream_name = "TWL6040",
         .cpu_dai_name ="omap-mcpdm-dai",
         .codec_dai_name = "twl6040-hifi",
@@ skipping 47 matching lines @@
 static void __exit sdp4430_soc_exit(void)
 {
         platform_device_unregister(sdp4430_snd_device);
 }
 module_exit(sdp4430_soc_exit);
 
 MODULE_AUTHOR("Misael Lopez Cruz <x0052729@ti.com>");
 MODULE_DESCRIPTION("ALSA SoC SDP4430");
 MODULE_LICENSE("GPL");