ALSA: jack - Add "Line In" input jack constants

Similar to Line Out, these constants form the base for future
patches enabling input jack reporting for Line in jacks.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

4 files changed, 5 insertions, 0 deletions

diff --git a/include/linux/input.h b/include/linux/input.h
index a637e7814334..a514fb8faea3 100644
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -814,6 +814,7 @@ struct input_keymap_entry {
 #define SW_KEYPAD_SLIDE         0x0a  /* set = keypad slide out */
 #define SW_FRONT_PROXIMITY      0x0b  /* set = front proximity sensor active */
 #define SW_ROTATE_LOCK          0x0c  /* set = rotate locked/disabled */
+#define SW_LINEIN_INSERT        0x0d  /* 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 c140fc7cbd3f..63c790742db4 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -42,6 +42,7 @@ enum snd_jack_types {
         SND_JACK_MECHANICAL     = 0x0008, /* If detected separately */
         SND_JACK_VIDEOOUT       = 0x0010,
         SND_JACK_AVOUT          = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
+        SND_JACK_LINEIN         = 0x0020,
 
         /* Kept separate from switches to facilitate implementation */
         SND_JACK_BTN_0          = 0x4000,
diff --git a/sound/core/jack.c b/sound/core/jack.c
index 53b53e97c896..240a3e13470d 100644
--- a/sound/core/jack.c
+++ b/sound/core/jack.c
@@ -30,6 +30,7 @@ static int jack_switch_types[] = {
         SW_LINEOUT_INSERT,
         SW_JACK_PHYSICAL_INSERT,
         SW_VIDEOOUT_INSERT,
+        SW_LINEIN_INSERT,
 };
 
 static int snd_jack_dev_free(struct snd_device *device)
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c
index e3db19610411..8b046a10b42b 100644
--- a/sound/pci/hda/hda_codec.c
+++ b/sound/pci/hda/hda_codec.c
@@ -5264,6 +5264,8 @@ static const char *get_jack_default_name(struct hda_codec *codec, hda_nid_t nid,
                 return "Mic";
         case SND_JACK_LINEOUT:
                 return "Line-out";
+        case SND_JACK_LINEIN:
+                return "Line-in";
         case SND_JACK_HEADSET:
                 return "Headset";
         case SND_JACK_VIDEOOUT: