asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ANDROID: GKI: ALSA: jack: Add support to report second microphone

Browse source 
ALSA jack framework currently supports reporting only
one single microphone. Add support to report presence of
the second microphone to userspace.

Test: build
Bug: 149430094
Change-Id: I72d16892f2fa563c026bf90d847d9365dcf2233a
Signed-off-by: Phani Kumar Uppalapati <phaniu@codeaurora.org>
Signed-off-by: Banajit Goswami <bgoswami@codeaurora.org>
Signed-off-by: Sudheer Papothi <spapothi@codeaurora.org>
Signed-off-by: Meng Wang <mwang@codeaurora.org>
(cherry picked from commit b071d2a1b2)
Signed-off-by: Hridya Valsaraju <hridya@google.com>
This commit is contained in:
Banajit Goswami 2016-11-21 17:49:35 -08:00 committed by Hridya Valsaraju
parent 3d8c1bbf03
commit 98a387cdfe
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sound/jack.h
View file

@ -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,

3
include/uapi/linux/input-event-codes.h
View file

@ -797,7 +797,8 @@
#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
#define SW_HPHL_OVERCURRENT 0x10 /* set = over current on left hph */
#define SW_HPHR_OVERCURRENT 0x11 /* set = over current on right hph */
#define SW_UNSUPPORT_INSERT 0x12 /* set = unsupported device inserted */
#define SW_MICROPHONE2_INSERT 0x12 /* set = inserted */
#define SW_UNSUPPORT_INSERT 0x13 /* set = unsupported device inserted */
#define SW_MAX 0x20
#define SW_CNT (SW_MAX+1)

1
sound/core/jack.c
View file

@ -43,6 +43,7 @@ static int jack_switch_types[] = {
SW_HPHL_OVERCURRENT,
SW_HPHR_OVERCURRENT,
SW_UNSUPPORT_INSERT,
SW_MICROPHONE2_INSERT,
};
#endif /* CONFIG_SND_JACK_INPUT_DEV */