AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-04-02 12:47:57 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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:
David Henningsson 2011-10-05 15:53:25 +02:00 committed by Takashi Iwai
parent 48718eab5a
commit 7c2f8e4009
4 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/input.h
View File

@ -814,6 +814,7 @@ struct input_keymap_entry {
#define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */ #define SW_KEYPAD_SLIDE 0x0a /* set = keypad slide out */
#define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */ #define SW_FRONT_PROXIMITY 0x0b /* set = front proximity sensor active */
#define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */ #define SW_ROTATE_LOCK 0x0c /* set = rotate locked/disabled */
#define SW_LINEIN_INSERT 0x0d /* set = inserted */
#define SW_MAX 0x0f #define SW_MAX 0x0f
#define SW_CNT (SW_MAX+1) #define SW_CNT (SW_MAX+1)

1
include/sound/jack.h
View File

@ -42,6 +42,7 @@ enum snd_jack_types {
SND_JACK_MECHANICAL = 0x0008, /* If detected separately */ SND_JACK_MECHANICAL = 0x0008, /* If detected separately */
SND_JACK_VIDEOOUT = 0x0010, SND_JACK_VIDEOOUT = 0x0010,
SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT, SND_JACK_AVOUT = SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,
SND_JACK_LINEIN = 0x0020,
/* Kept separate from switches to facilitate implementation */ /* Kept separate from switches to facilitate implementation */
SND_JACK_BTN_0 = 0x4000, SND_JACK_BTN_0 = 0x4000,

1
sound/core/jack.c
View File

@ -30,6 +30,7 @@ static int jack_switch_types[] = {
SW_LINEOUT_INSERT, SW_LINEOUT_INSERT,
SW_JACK_PHYSICAL_INSERT, SW_JACK_PHYSICAL_INSERT,
SW_VIDEOOUT_INSERT, SW_VIDEOOUT_INSERT,
SW_LINEIN_INSERT,
}; };
static int snd_jack_dev_free(struct snd_device *device) static int snd_jack_dev_free(struct snd_device *device)

2
sound/pci/hda/hda_codec.c
View File

@ -5264,6 +5264,8 @@ static const char *get_jack_default_name(struct hda_codec *codec, hda_nid_t nid,
return "Mic"; return "Mic";
case SND_JACK_LINEOUT: case SND_JACK_LINEOUT:
return "Line-out"; return "Line-out";
case SND_JACK_LINEIN:
return "Line-in";
case SND_JACK_HEADSET: case SND_JACK_HEADSET:
return "Headset"; return "Headset";
case SND_JACK_VIDEOOUT: case SND_JACK_VIDEOOUT: