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-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Revert "Revert "ANDROID: ALSA: jack: Update supported ja..."

Browse source 
Now that we have partner approval, we can revert for real.

Revert submission 1382582

Reason for revert: QC confirms no longer needed
Reverted Changes:
Ie71a68da0:Revert "Revert "ANDROID: ALSA: jack: Update suppor...

Change-Id: Ibf10f8ab05d6705348a8475d9932ec0959b4b292
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-08-04 21:23:35 +00:00
commit f6d01a049a
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

@ -318,7 +318,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

@ -53,6 +53,9 @@ enum snd_jack_types {
SND_JACK_BTN_5 = 0x0200,
};
/* 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

@ -809,10 +809,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

@ -19,16 +19,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 */
@ -239,7 +236,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]);