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

Commit c48bd2c6 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "ALSA: jack: Add support to report second microphone""

parents 76eff845 a93f8ae6

include/sound/jack.h

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

#endif



	/* Kept separate from switches to facilitate implementation */

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

+1 −6
Original line number Diff line number Diff line
@@ -810,12 +810,7 @@ 
#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 */

#ifdef CONFIG_AUDIO_QGKI

#define SW_MICROPHONE2_INSERT	0x12  /* set = inserted */

#define SW_UNSUPPORT_INSERT	0x13  /* set = unsupported device inserted */

#else

#define SW_UNSUPPORT_INSERT	0x12  /* set = unsupported device inserted */

#endif

#define SW_MAX			0x20

#define SW_CNT			(SW_MAX+1)

sound/core/jack.c

+0 −3
Original line number Diff line number Diff line
@@ -29,9 +29,6 @@ static int jack_switch_types[] = { 
	SW_HPHL_OVERCURRENT,

	SW_HPHR_OVERCURRENT,

	SW_UNSUPPORT_INSERT,

#ifdef CONFIG_AUDIO_QGKI

	SW_MICROPHONE2_INSERT,

#endif

};

#endif /* CONFIG_SND_JACK_INPUT_DEV */