TechPanelGM/kernel_xiaomi_sm8250
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 98a387cdfe.
This change is not needed anymore as ANC is not supported.

Change-Id: I522971a59945a84a71d243120d2b43ac67f2ae7f
Signed-off-by: Meng Wang <mengw@codeaurora.org>
This commit is contained in:
Meng Wang
2020-04-23 08:39:56 +08:00
committed by Tommy Webb
parent eda293580e
commit 93ce0b2655
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/jack.h
View File

@@ -61,9 +61,6 @@ enum snd_jack_types {
SND_JACK_OC_HPHL = 0x0040, SND_JACK_OC_HPHL = 0x0040,
SND_JACK_OC_HPHR = 0x0080, SND_JACK_OC_HPHR = 0x0080,
SND_JACK_UNSUPPORTED = 0x0100, 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 */ /* Kept separate from switches to facilitate implementation */
SND_JACK_BTN_0 = 0x8000, SND_JACK_BTN_0 = 0x8000,

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

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

1
sound/core/jack.c
View File

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