ALSA: jack: lineout support to jack abstraction layer

This patch introduces support for reporting SW_LINEOUT_INSERT detection events
via the jack abstraction layer.

Also adds a SND_JACK_LINEOUT define to the input system header.

Signed-off-by: Matthew Ranostay <mranostay@embeddedalley.com>
Cc: Dmitry Torokhov <dtor@mail.ru>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/include/linux/input.h b/include/linux/input.h
index a5802c9c81a47831996a93cffc00fcb7190d4089..7323d2ff5151431475884cdfd10a6cb941fd8420 100644 (file)
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -644,6 +644,7 @@ struct input_absinfo {
 #define SW_RADIO               SW_RFKILL_ALL   /* deprecated */
 #define SW_MICROPHONE_INSERT   0x04  /* set = inserted */
 #define SW_DOCK                        0x05  /* set = plugged into dock */
+#define SW_LINEOUT_INSERT      0x06  /* set = inserted */
 #define SW_MAX                 0x0f
 #define SW_CNT                 (SW_MAX+1)
 

diff --git a/include/sound/jack.h b/include/sound/jack.h
index b1b2b8b59adbe67d7efb817b09f7b985ad0422e7..7cb25f4b50bbc3f76199a95516f9a9ea764717d3 100644 (file)
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -35,6 +35,7 @@ enum snd_jack_types {
        SND_JACK_HEADPHONE      = 0x0001,
        SND_JACK_MICROPHONE     = 0x0002,
        SND_JACK_HEADSET        = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,
+       SND_JACK_LINEOUT        = 0x0004,
 };
 
 struct snd_jack {

diff --git a/sound/core/jack.c b/sound/core/jack.c
index 8133a2b173a58bfe38603bf694a3245a746c90be..c4bb9bad31331b0e4536a913fc7a67bdd0b3aaf8 100644 (file)
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -102,6 +102,9 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
        if (type & SND_JACK_HEADPHONE)
                input_set_capability(jack->input_dev, EV_SW,
                                     SW_HEADPHONE_INSERT);
+       if (type & SND_JACK_LINEOUT)
+               input_set_capability(jack->input_dev, EV_SW,
+                                    SW_LINEOUT_INSERT);
        if (type & SND_JACK_MICROPHONE)
                input_set_capability(jack->input_dev, EV_SW,
                                     SW_MICROPHONE_INSERT);
@@ -150,6 +153,9 @@ void snd_jack_report(struct snd_jack *jack, int status)
        if (jack->type & SND_JACK_HEADPHONE)
                input_report_switch(jack->input_dev, SW_HEADPHONE_INSERT,
                                    status & SND_JACK_HEADPHONE);
+       if (jack->type & SND_JACK_LINEOUT)
+               input_report_switch(jack->input_dev, SW_LINEOUT_INSERT,
+                                   status & SND_JACK_LINEOUT);
        if (jack->type & SND_JACK_MICROPHONE)
                input_report_switch(jack->input_dev, SW_MICROPHONE_INSERT,
                                    status & SND_JACK_MICROPHONE);