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

ASoC: Intel: sof_cs42l42: 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-11-pierre-louis.bossart@linux.intel.com


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

sound/soc/intel/boards/sof_cs42l42.c

+18 −5
Original line number Diff line number Diff line
@@ -52,6 +52,17 @@ enum { 
	LINK_HDMI = 4,

};



static struct snd_soc_jack_pin jack_pins[] = {

	{

		.pin    = "Headphone Jack",

		.mask   = SND_JACK_HEADPHONE,

	},

	{

		.pin    = "Headset Mic",

		.mask   = SND_JACK_MICROPHONE,

	},

};



/* Default: SSP2 */

static unsigned long sof_cs42l42_quirk = SOF_CS42L42_SSP_CODEC(2);
@@ -98,11 +109,13 @@ static int sof_cs42l42_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,

				    jack);

					 jack,

					 jack_pins,

					 ARRAY_SIZE(jack_pins));

	if (ret) {

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

		return ret;