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

ASoC: mediatek: mt8173-rt5650-rt5676: Map missing jack kcontrols 



This driver does not properly map jack pins to kcontrols that PulseAudio
and PipeWire need to handle jack detection events. The RT5645 codec used
here can detect Headphone and Headset Mic connections. Expose both to
userspace as kcontrols.

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


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

sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c

+18 −5
Original line number Diff line number Diff line
@@ -44,6 +44,17 @@ static const struct snd_kcontrol_new mt8173_rt5650_rt5676_controls[] = { 
	SOC_DAPM_PIN_SWITCH("Headset Mic"),

};



static struct snd_soc_jack_pin mt8173_rt5650_rt5676_jack_pins[] = {

	{

		.pin	= "Headphone",

		.mask	= SND_JACK_HEADPHONE,

	},

	{

		.pin	= "Headset Mic",

		.mask	= SND_JACK_MICROPHONE,

	},

};



static int mt8173_rt5650_rt5676_hw_params(struct snd_pcm_substream *substream,

					  struct snd_pcm_hw_params *params)

{
@@ -95,11 +106,13 @@ static int mt8173_rt5650_rt5676_init(struct snd_soc_pcm_runtime *runtime) 
				RT5677_CLK_SEL_I2S2_ASRC);



	/* enable jack detection */

	ret = snd_soc_card_jack_new(card, "Headset Jack",

	ret = snd_soc_card_jack_new_pins(card, "Headset Jack",

					 SND_JACK_HEADPHONE | SND_JACK_MICROPHONE |

					 SND_JACK_BTN_0 | SND_JACK_BTN_1 |

					 SND_JACK_BTN_2 | SND_JACK_BTN_3,

				    &mt8173_rt5650_rt5676_jack);

					 &mt8173_rt5650_rt5676_jack,

					 mt8173_rt5650_rt5676_jack_pins,

					 ARRAY_SIZE(mt8173_rt5650_rt5676_jack_pins));

	if (ret) {

		dev_err(card->dev, "Can't new Headset Jack %d\n", ret);

		return ret;