A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 23:24:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit c559fb7c52.
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 Gerrit - the friendly Code Review server
commit a93f8ae6a7
3 changed files with 1 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/sound/jack.h
View file

@ -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 */

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

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

3
sound/core/jack.c
View file

@ -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 */