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

ASoC: amd: acp-rt5645: 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-3-alpernebiyasak@gmail.com


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

sound/soc/amd/acp-rt5645.c

+17 −5
Original line number Diff line number Diff line
@@ -42,6 +42,16 @@ 
#define CZ_PLAT_CLK 24000000



static struct snd_soc_jack cz_jack;

static struct snd_soc_jack_pin cz_jack_pins[] = {

	{

		.pin = "Headphones",

		.mask = SND_JACK_HEADPHONE,

	},

	{

		.pin = "Headset Mic",

		.mask = SND_JACK_MICROPHONE,

	},

};



static int cz_aif1_hw_params(struct snd_pcm_substream *substream,

			     struct snd_pcm_hw_params *params)
@@ -76,11 +86,13 @@ static int cz_init(struct snd_soc_pcm_runtime *rtd) 
	codec = asoc_rtd_to_codec(rtd, 0)->component;

	card = rtd->card;



	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,

				&cz_jack);

					 &cz_jack,

					 cz_jack_pins,

					 ARRAY_SIZE(cz_jack_pins));

	if (ret) {

		dev_err(card->dev, "HP jack creation failed %d\n", ret);

		return ret;