Unverified Commit 42de42c2 authored by Nícolas F. R. A. Prado's avatar Nícolas F. R. A. Prado Committed by Mark Brown
Browse files

ASoC: mediatek: mt8186-rt5682: Expose individual headset jack pins 



The rt5682 codec is able to distinguish between two event types:
headphone insertion/removal and headset microphone insertion/removal.
However, currently, the mt8186-rt5682 driver exposes a single kcontrol
for the headset jack, so userspace isn't able to differentiate between
the two events.

Add a definition for the headset jack pins, so that a separate jack
kcontrol is created for each one, allowing userspace to track and handle
them individually.

Signed-off-by: default avatarNícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220922235951.252532-7-nfraprado@collabora.com


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

sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c

+15 −2
Original line number Diff line number Diff line
@@ -41,6 +41,18 @@ struct mt8186_mt6366_rt1019_rt5682s_priv { 
	struct snd_soc_jack headset_jack, hdmi_jack;

};



/* Headset jack detection DAPM pins */

static struct snd_soc_jack_pin mt8186_jack_pins[] = {

	{

		.pin = "Headphone",

		.mask = SND_JACK_HEADPHONE,

	},

	{

		.pin = "Headset Mic",

		.mask = SND_JACK_MICROPHONE,

	},

};



static struct snd_soc_codec_conf mt8186_mt6366_rt1019_rt5682s_codec_conf[] = {

	{

		.dlc = COMP_CODEC_CONF("mt6358-sound"),
@@ -75,11 +87,12 @@ static int mt8186_rt5682s_init(struct snd_soc_pcm_runtime *rtd) 
		return ret;

	}



	ret = snd_soc_card_jack_new(rtd->card, "Headset Jack",

	ret = snd_soc_card_jack_new_pins(rtd->card, "Headset Jack",

				    SND_JACK_HEADSET | SND_JACK_BTN_0 |

				    SND_JACK_BTN_1 | SND_JACK_BTN_2 |

				    SND_JACK_BTN_3,

				    jack);

				    jack, mt8186_jack_pins,

				    ARRAY_SIZE(mt8186_jack_pins));

	if (ret) {

		dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret);

		return ret;