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

ASoC: rk3399-gru-sound: Map missing Line Out jack kcontrol 



Commit d0508b4f ("ASoC: rk3399_gru_sound: Add DAPM pins, kcontrols
for jack detection") maps kcontrols for Headphones and Headset Mic jacks
for this driver so that PulseAudio and PipeWire can handle insertion
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 widget.

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


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

sound/soc/rockchip/rk3399_gru_sound.c

+6 −1
Original line number Diff line number Diff line
@@ -41,13 +41,17 @@ static struct snd_soc_jack_pin rockchip_sound_jack_pins[] = { 
		.pin = "Headset Mic",

		.mask = SND_JACK_MICROPHONE,

	},



	{

		.pin = "Line Out",

		.mask = SND_JACK_LINEOUT,

	},

};



static const struct snd_soc_dapm_widget rockchip_dapm_widgets[] = {

	SND_SOC_DAPM_HP("Headphones", NULL),

	SND_SOC_DAPM_SPK("Speakers", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_LINE("Line Out", NULL),

	SND_SOC_DAPM_MIC("Int Mic", NULL),

	SND_SOC_DAPM_LINE("HDMI", NULL),

};
@@ -56,6 +60,7 @@ static const struct snd_kcontrol_new rockchip_controls[] = { 
	SOC_DAPM_PIN_SWITCH("Headphones"),

	SOC_DAPM_PIN_SWITCH("Speakers"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

	SOC_DAPM_PIN_SWITCH("Line Out"),

	SOC_DAPM_PIN_SWITCH("Int Mic"),

	SOC_DAPM_PIN_SWITCH("HDMI"),

};