Unverified Commit 4c3a68e9 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

ASoC: Intel: glk_rt5682_max98357a: remap jack pins 



The card did not map jack pins to controls, which prevents
PulseAudio/PipeWire from dealing with jack detection. It's likely that
jack detection was only tested with the CRAS server and extensions of
UCM.

Suggested-by: default avatarJaroslav Kysela <perex@perex.cz>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: default avatarRanjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: default avatarPéter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220616214055.134943-9-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/glk_rt5682_max98357a.c

+17 −4
Original line number Diff line number Diff line
@@ -78,6 +78,17 @@ static const struct snd_soc_dapm_widget geminilake_widgets[] = { 
	SND_SOC_DAPM_SPK("HDMI3", NULL),

};



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



static const struct snd_soc_dapm_route geminilake_map[] = {

	/* HP jack connectors - unknown if we have jack detection */

	{ "Headphone Jack", NULL, "HPOL" },
@@ -173,10 +184,12 @@ static int geminilake_rt5682_codec_init(struct snd_soc_pcm_runtime *rtd) 
	 * Headset buttons map to the google Reference headset.

	 * These can be configured by userspace.

	 */

	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 | SND_JACK_LINEOUT,

			&ctx->geminilake_headset);

					 &ctx->geminilake_headset,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {

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

		return ret;