Unverified Commit 2830bfdb authored by Alper Nebi Yasak's avatar Alper Nebi Yasak Committed by Mark Brown
Browse files

ASoC: Intel: kbl_da7219_max98927: Map missing Line Out jack kcontrol 



Commit b9f53b9f ("ASoC: Intel: kbl_da7219_max98927: remap jack
pins") maps kcontrols for Headphone and Headset Mic jacks for this
driver so that PulseAudio and PipeWire can handle jack detection events
for these peripherals.

The DA7219 codec used here can also distinguish between Headphone and
Line Out connections that go into the same physical port. Expose the
latter to userspace as a kcontrol as well and add the necessary widgets.

Signed-off-by: default avatarAlper Nebi Yasak <alpernebiyasak@gmail.com>
Link: https://lore.kernel.org/r/20230802175737.263412-10-alpernebiyasak@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent da09176f

sound/soc/intel/boards/kbl_da7219_max98927.c

+7 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ static const struct snd_kcontrol_new kabylake_controls[] = { 
	SOC_DAPM_PIN_SWITCH("Headset Mic"),

	SOC_DAPM_PIN_SWITCH("Left Spk"),

	SOC_DAPM_PIN_SWITCH("Right Spk"),

	SOC_DAPM_PIN_SWITCH("Line Out"),

};



static const struct snd_soc_dapm_widget kabylake_widgets[] = {
@@ -109,6 +110,7 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = { 
	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_SPK("Left Spk", NULL),

	SND_SOC_DAPM_SPK("Right Spk", NULL),

	SND_SOC_DAPM_LINE("Line Out", NULL),

	SND_SOC_DAPM_MIC("SoC DMIC", NULL),

	SND_SOC_DAPM_SPK("HDMI1", NULL),

	SND_SOC_DAPM_SPK("HDMI2", NULL),
@@ -127,6 +129,10 @@ static struct snd_soc_jack_pin jack_pins[] = { 
		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

	{

		.pin    = "Line Out",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static const struct snd_soc_dapm_route kabylake_map[] = {
@@ -182,6 +188,7 @@ static const struct snd_soc_dapm_route kabylake_ssp1_map[] = { 


	{ "Headphone Jack", NULL, "Platform Clock" },

	{ "Headset Mic", NULL, "Platform Clock" },

	{ "Line Out", NULL, "Platform Clock" },

};



static int kabylake_ssp0_hw_params(struct snd_pcm_substream *substream,