From a93f8ae6a73944c0f5429807fa52dabd393d0eff Mon Sep 17 00:00:00 2001 From: Meng Wang Date: Thu, 23 Apr 2020 08:39:56 +0800 Subject: [PATCH] Revert "ALSA: jack: Add support to report second microphone" This reverts commit c559fb7c52e33b707338d4e319ecdb46317ff6ee. This change is not needed anymore as ANC is not supported. Change-Id: I522971a59945a84a71d243120d2b43ac67f2ae7f Signed-off-by: Meng Wang --- include/sound/jack.h | 3 --- include/uapi/linux/input-event-codes.h | 7 +------ sound/core/jack.c | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/include/sound/jack.h b/include/sound/jack.h index 5c80e057445a..19020ee43a19 100644 --- a/include/sound/jack.h +++ b/include/sound/jack.h @@ -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 */ diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h index 4cc770c490d4..35125b6c30de 100644 --- a/include/uapi/linux/input-event-codes.h +++ b/include/uapi/linux/input-event-codes.h @@ -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_UNSUPPORT_INSERT 0x12 /* set = unsupported device inserted */ #define SW_MAX 0x20 #define SW_CNT (SW_MAX+1) diff --git a/sound/core/jack.c b/sound/core/jack.c index d548122fd823..e1594d0ca61f 100644 --- a/sound/core/jack.c +++ b/sound/core/jack.c @@ -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 */