summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/sound/jack.h3
-rw-r--r--include/uapi/linux/input-event-codes.h1
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sound/jack.h b/include/sound/jack.h
index 9b60df639f6f..424f8fbae601 100644
--- a/include/sound/jack.h
+++ b/include/sound/jack.h
@@ -61,6 +61,9 @@ enum snd_jack_types {
SND_JACK_OC_HPHL = 0x0040,
SND_JACK_OC_HPHR = 0x0080,
SND_JACK_UNSUPPORTED = 0x0100,
+ SND_JACK_MICROPHONE2 = 0x0200,
+ SND_JACK_ANC_HEADPHONE = SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |
+ SND_JACK_MICROPHONE2,
/* Kept separate from switches to facilitate implementation */
SND_JACK_BTN_0 = 0x4000,
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index b97184a4175e..88956276c8ab 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -751,6 +751,7 @@
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
#define SW_HPHL_OVERCURRENT 0x0f /* set = over current on left hph */
#define SW_HPHR_OVERCURRENT 0x10 /* set = over current on right hph */
+#define SW_MICROPHONE2_INSERT 0x11 /* set = inserted */
#define SW_UNSUPPORT_INSERT 0x12 /* set = unsupported device inserted */
#define SW_MAX 0x20
#define SW_CNT (SW_MAX+1)