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

Commit d506fc32 authored by Jani Nikula's avatar Jani Nikula Committed by Mark Brown
Browse files

ALSA: Add support for video out to the jack reporting API 



Add support for reporting new jack types SND_JACK_VIDEOOUT and
SND_JACK_AVOUT (a combination of LINEOUT and VIDEOOUT) to the jack
reporting API.

Also add the corresponding SW_VIDEOOUT_INSERT switch to the input system
header.

Signed-off-by: default avatarJani Nikula <ext-jani.1.nikula@nokia.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent bd8a71a7

include/linux/input.h

+1 −0
Original line number Diff line number Diff line
@@ -661,6 +661,7 @@ struct input_absinfo { 
#define SW_DOCK			0x05  /* set = plugged into dock */

#define SW_LINEOUT_INSERT	0x06  /* set = inserted */

#define SW_JACK_PHYSICAL_INSERT 0x07  /* set = mechanical switch set */

#define SW_VIDEOOUT_INSERT	0x08  /* set = inserted */

#define SW_MAX			0x0f

#define SW_CNT			(SW_MAX+1)

include/sound/jack.h

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ enum snd_jack_types { 
	SND_JACK_HEADSET	= SND_JACK_HEADPHONE | SND_JACK_MICROPHONE,

	SND_JACK_LINEOUT	= 0x0004,

	SND_JACK_MECHANICAL	= 0x0008, /* If detected separately */

	SND_JACK_VIDEOOUT	= 0x0010,

	SND_JACK_AVOUT		= SND_JACK_LINEOUT | SND_JACK_VIDEOOUT,

};



struct snd_jack {

sound/core/jack.c

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ static int jack_types[] = { 
	SW_MICROPHONE_INSERT,

	SW_LINEOUT_INSERT,

	SW_JACK_PHYSICAL_INSERT,

	SW_VIDEOOUT_INSERT,

};



static int snd_jack_dev_free(struct snd_device *device)