Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ALSA: Add more jack button slots

Some devices have more flexible microphone detection and can detect
a wider range of buttons.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

authored by

Mark Brown and committed by
Takashi Iwai
831853c8 68885a3f

+4 -1
+4 -1
include/sound/jack.h
··· 47 47 SND_JACK_BTN_0 = 0x4000, 48 48 SND_JACK_BTN_1 = 0x2000, 49 49 SND_JACK_BTN_2 = 0x1000, 50 + SND_JACK_BTN_3 = 0x0800, 51 + SND_JACK_BTN_4 = 0x0400, 52 + SND_JACK_BTN_5 = 0x0200, 50 53 }; 51 54 52 55 struct snd_jack { ··· 58 55 int type; 59 56 const char *id; 60 57 char name[100]; 61 - unsigned int key[3]; /* Keep in sync with definitions above */ 58 + unsigned int key[6]; /* Keep in sync with definitions above */ 62 59 void *private_data; 63 60 void (*private_free)(struct snd_jack *); 64 61 };