mirror of
https://github.com/torvalds/linux.git
synced 2024-11-25 21:51:40 +00:00
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>
This commit is contained in:
parent
48718eab5a
commit
7c2f8e4009
@ -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)
|
||||
|
||||
|
@ -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,
|
||||
|
@ -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)
|
||||
|
@ -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:
|
||||
|
Loading…
Reference in New Issue
Block a user