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

Revert "ANDROID: ALSA: jack: Update supported jack switch types"

Browse Source 
Revert submission 144587-1572027951673-b7d38b4

Reason for revert: See b/142489397
Reverted Changes:
Ia6d475540:ANDROID: ASoC: compress: fix unsigned integer over...
If77f8b37b:ANDROID: ALSA: jack: Update supported jack switch ...
Change-Id: Ifd73cf33379ff4893cf17ea447f1031bde796434
Signed-off-by: Todd Kjos <tkjos@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Todd Kjos
2020-07-30 23:53:11 +00:00
committed by Tommy Webb
parent 93ce0b2655
commit 4d1f0118e2
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mod_devicetable.h
View File

@@ -299,7 +299,7 @@ struct pcmcia_device_id {
#define INPUT_DEVICE_ID_LED_MAX 0x0f
#define INPUT_DEVICE_ID_SND_MAX 0x07
#define INPUT_DEVICE_ID_FF_MAX 0x7f
#define INPUT_DEVICE_ID_SW_MAX 0x20
#define INPUT_DEVICE_ID_SW_MAX 0x10
#define INPUT_DEVICE_ID_PROP_MAX 0x1f
#define INPUT_DEVICE_ID_MATCH_BUS 1

3
include/sound/jack.h
View File

@@ -71,6 +71,9 @@ enum snd_jack_types {
SND_JACK_BTN_5 = 0x0400,
};
/* Keep in sync with definitions above */
#define SND_JACK_SWITCH_TYPES 6
struct snd_jack {
struct list_head kctl_list;
struct snd_card *card;

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

@@ -798,10 +798,7 @@
#define SW_MUTE_DEVICE 0x0e /* set = device disabled */
#define SW_PEN_INSERTED 0x0f /* set = pen inserted */
#define SW_MACHINE_COVER 0x10 /* set = cover closed */
#define SW_HPHL_OVERCURRENT 0x11 /* set = over current on left hph */
#define SW_HPHR_OVERCURRENT 0x12 /* set = over current on right hph */
#define SW_UNSUPPORT_INSERT 0x13 /* set = unsupported device inserted */
#define SW_MAX 0x20
#define SW_MAX 0x10
#define SW_CNT (SW_MAX+1)
/*

7
sound/core/jack.c
View File

@@ -33,16 +33,13 @@ struct snd_jack_kctl {
};
#ifdef CONFIG_SND_JACK_INPUT_DEV
static int jack_switch_types[] = {
static int jack_switch_types[SND_JACK_SWITCH_TYPES] = {
SW_HEADPHONE_INSERT,
SW_MICROPHONE_INSERT,
SW_LINEOUT_INSERT,
SW_JACK_PHYSICAL_INSERT,
SW_VIDEOOUT_INSERT,
SW_LINEIN_INSERT,
SW_HPHL_OVERCURRENT,
SW_HPHR_OVERCURRENT,
SW_UNSUPPORT_INSERT,
};
#endif /* CONFIG_SND_JACK_INPUT_DEV */
@@ -260,7 +257,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type,
jack->type = type;
for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++)
for (i = 0; i < SND_JACK_SWITCH_TYPES; i++)
if (type & (1 << i))
input_set_capability(jack->input_dev, EV_SW,
jack_switch_types[i]);