Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99d18eb5 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ALSA: jack: Add support to report second microphone" into msm-4.8

parents 996fddbe ebc05935

include/sound/jack.h

+3 −0
Original line number Diff line number Diff line
@@ -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,

include/uapi/linux/input-event-codes.h

+2 −1
Original line number Diff line number Diff line
@@ -783,7 +783,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)

sound/core/jack.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */