Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 831853c87fb7234a8650484d30993242ea9ad6d3

Authored by Mark Brown
Committed by Takashi Iwai
1 parent 68885a3ff3
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 4 additions and 1 deletions Side-by-side Diff

include/sound/jack.h
Diff comments   View file @ 831853c
... ... @@ -47,6 +47,9 @@
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 {
... ... @@ -55,7 +58,7 @@
55 58 int type;
56 59 const char *id;
57 60 char name[100];
58   - unsigned int key[3]; /* Keep in sync with definitions above */
  61 + unsigned int key[6]; /* Keep in sync with definitions above */
59 62 void *private_data;
60 63 void (*private_free)(struct snd_jack *);
61 64 };