Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc

1 files changed, 39 insertions, 4 deletions

diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/sdp4430.c
index ebbd62fc447c..189e03900637 100644
--- a/sound/soc/omap/sdp4430.c
+++ b/sound/soc/omap/sdp4430.c
@@ -24,6 +24,7 @@
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/soc.h>
+#include <sound/jack.h>
 
 #include <asm/mach-types.h>
 #include <plat/hardware.h>
@@ -65,6 +66,21 @@ 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)
 {
@@ -101,6 +117,7 @@ static const struct snd_soc_dapm_widget sdp4430_twl6040_dapm_widgets[] = {
         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[] = {
@@ -123,6 +140,10 @@ static const struct snd_soc_dapm_route audio_map[] = {
 
         /* 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)
@@ -149,14 +170,28 @@ static int sdp4430_twl6040_init(struct snd_soc_pcm_runtime *rtd)
         /* SDP4430 connected pins */
         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(dapm, "AFML");
-        snd_soc_dapm_nc_pin(dapm, "AFMR");
-
         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),
+                                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;
 }