Merge branch 'topic/jack-mechanical' into to-push

diff --git a/include/linux/input.h b/include/linux/input.h
index 1a958cd90ce908d857fc29d945fee6587874469f..9a6355f74db25b28233cb3d9d8765d7aec13632e 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -660,6 +660,7 @@ struct input_absinfo {
 #define SW_MICROPHONE_INSERT   0x04  /* set = inserted */
 #define SW_DOCK                        0x05  /* set = plugged into dock */
 #define SW_LINEOUT_INSERT      0x06  /* set = inserted */
+#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */
 #define SW_MAX                 0x0f
 #define SW_CNT                 (SW_MAX+1)
 

diff --git a/include/sound/jack.h b/include/sound/jack.h
index 7cb25f4b50bbc3f76199a95516f9a9ea764717d3..2e0315cdd0d6780636d25dce4304dba14702238c 100644 (file)
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -36,6 +36,7 @@ enum snd_jack_types {
        SND_JACK_MICROPHONE     = 0x0002,
        SND_JACK_HEADSET        = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
        SND_JACK_LINEOUT        = 0x0004,
+       SND_JACK_MECHANICAL     = 0x0008, /* If detected separately */
 };
 
 struct snd_jack {

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 284432f427f4b7c32a178a11329520e112dedbee..dd4a12dc09aa44f4c50c5b60f2cf5584c5635589 100644 (file)
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -109,6 +109,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
        if (type & SND_JACK_MICROPHONE)
                input_set_capability(jack->input_dev, EV_SW,
                                     SW_MICROPHONE_INSERT);
+       if (type & SND_JACK_MECHANICAL)
+               input_set_capability(jack->input_dev, EV_SW,
+                                    SW_JACK_PHYSICAL_INSERT);
 
        err = snd_device_new(card, SNDRV_DEV_JACK, jack, &ops);
        if (err < 0)
@@ -163,6 +166,9 @@ void snd_jack_report(struct snd_jack *jack, int status)
        if (jack->type & SND_JACK_MICROPHONE)
                input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,
                                    status & SND_JACK_MICROPHONE);
+       if (jack->type & SND_JACK_MECHANICAL)
+               input_report_switch(jack->input_dev, SW_JACK_PHYSICAL_INSERT,
+                                   status & SND_JACK_MECHANICAL);
 
        input_sync(jack->input_dev);
 }