Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 006f2d92 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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



This reverts commit 22082e3e.

Shouldn't have been reverted from this branch.

Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Ie71a68da01b80d3d8ff770dcf68135fbeb5c847f
parent dc238819

include/linux/mod_devicetable.h

+1 −1
Original line number Diff line number Diff line
@@ -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		0x10

#define INPUT_DEVICE_ID_SW_MAX		0x20

#define INPUT_DEVICE_ID_PROP_MAX	0x1f



#define INPUT_DEVICE_ID_MATCH_BUS	1

include/sound/jack.h

+0 −3
Original line number Diff line number Diff line
@@ -53,9 +53,6 @@ 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;

include/uapi/linux/input-event-codes.h

+4 −1
Original line number Diff line number Diff line
@@ -809,7 +809,10 @@ 
#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_MAX			0x10

#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_CNT			(SW_MAX+1)



/*

sound/core/jack.c

+5 −2
Original line number Diff line number Diff line
@@ -19,13 +19,16 @@ struct snd_jack_kctl { 
};



#ifdef CONFIG_SND_JACK_INPUT_DEV

static int jack_switch_types[SND_JACK_SWITCH_TYPES] = {

static int 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 */
@@ -236,7 +239,7 @@ int snd_jack_new(struct snd_card *card, const char *id, int type, 


		jack->type = type;



		for (i = 0; i < SND_JACK_SWITCH_TYPES; i++)

		for (i = 0; i < ARRAY_SIZE(jack_switch_types); i++)

			if (type & (1 << i))

				input_set_capability(jack->input_dev, EV_SW,

						     jack_switch_types[i]);