leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: Intel: kbl_rt5663_rt5514_max98927: remap jack pins

Browse Source 
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: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Link: https://lore.kernel.org/r/20220616214055.134943-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart
2022-06-16 16:40:48 -05:00
committed by Mark Brown
parent b9f53b9fc1
commit c0703be996
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
View File

@@ -145,6 +145,17 @@ static const struct snd_soc_dapm_widget kabylake_widgets[] = {
}; };
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 kabylake_map[] = { static const struct snd_soc_dapm_route kabylake_map[] = {
/* Headphones */ /* Headphones */
{ "Headphone Jack", NULL, "Platform Clock" }, { "Headphone Jack", NULL, "Platform Clock" },
@@ -228,10 +239,12 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd)
* Headset buttons map to the google Reference headset. * Headset buttons map to the google Reference headset.
* These can be configured by userspace. * These can be configured by userspace.
*/ */
ret = snd_soc_card_jack_new(&kabylake_audio_card, "Headset Jack", ret = snd_soc_card_jack_new_pins(&kabylake_audio_card, "Headset Jack",
SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_HEADSET | SND_JACK_BTN_0 | SND_JACK_BTN_1 |
SND_JACK_BTN_2 | SND_JACK_BTN_3, SND_JACK_BTN_2 | SND_JACK_BTN_3,
&ctx->kabylake_headset); &ctx->kabylake_headset,
jack_pins,
ARRAY_SIZE(jack_pins));
if (ret) { if (ret) {
dev_err(rtd->dev, "Headset Jack creation failed %d\n", ret); dev_err(rtd->dev, "Headset Jack creation failed %d\n", ret);
return ret; return ret;