]> git.itanic.dy.fi Git - linux-stable/commitdiff
ASoC: mediatek: mt8186-da7219: Add headset widgets with switches
authorNícolas F. R. A. Prado <nfraprado@collabora.com>
Thu, 22 Sep 2022 23:59:48 +0000 (19:59 -0400)
committerMark Brown <broonie@kernel.org>
Fri, 23 Sep 2022 12:56:06 +0000 (13:56 +0100)
Add DAPM widgets for headphones and headset microphone, with matching
switches, to allow toggling these paths based on the jack connection
status.

Note that differently from others (mt8192, mt8195 and mt8186-rt5682),
the widget here is named "Headphones" (with an 's'), since "Headphone
Switch" was already registered by da7219.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220922235951.252532-4-nfraprado@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c

index 6f93f9dd4623d116c2ded705aa5d322aa865c8b6..8d428bc4a3b2a696cb09218a4899793df088fcaf 100644 (file)
@@ -950,6 +950,8 @@ static struct snd_soc_dai_link mt8186_mt6366_da7219_max98357_dai_links[] = {
 static const struct snd_soc_dapm_widget
 mt8186_mt6366_da7219_max98357_widgets[] = {
        SND_SOC_DAPM_SPK("Speakers", NULL),
+       SND_SOC_DAPM_HP("Headphones", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
        SND_SOC_DAPM_OUTPUT("HDMI1"),
        SND_SOC_DAPM_MIXER(SOF_DMA_DL1, SND_SOC_NOPM, 0, 0, NULL, 0),
        SND_SOC_DAPM_MIXER(SOF_DMA_DL2, SND_SOC_NOPM, 0, 0, NULL, 0),
@@ -961,6 +963,10 @@ static const struct snd_soc_dapm_route
 mt8186_mt6366_da7219_max98357_routes[] = {
        /* SPK */
        { "Speakers", NULL, "Speaker"},
+       /* Headset */
+       { "Headphones", NULL, "HPL" },
+       { "Headphones", NULL, "HPR" },
+       { "MIC", NULL, "Headset Mic" },
        /* HDMI */
        { "HDMI1", NULL, "TX"},
        /* SOF Uplink */
@@ -976,6 +982,8 @@ mt8186_mt6366_da7219_max98357_routes[] = {
 static const struct snd_kcontrol_new
 mt8186_mt6366_da7219_max98357_controls[] = {
        SOC_DAPM_PIN_SWITCH("Speakers"),
+       SOC_DAPM_PIN_SWITCH("Headphones"),
+       SOC_DAPM_PIN_SWITCH("Headset Mic"),
        SOC_DAPM_PIN_SWITCH("HDMI1"),
 };