ASoC: mediatek: mt8188-mt6359: register hdmi/dp jack pins

Some userspace applications need jack control events, so register hdmi
and dp jack pins to activate jack control events.

Signed-off-by: Trevor Wu <trevor.wu@mediatek.com>
Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com>
Link: https://lore.kernel.org/r/20230526093150.22923-4-trevor.wu@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
index 833bc362dad2f0ad717369ad08a93c3b71efd3af..6c3f36e2fffd1cee34f2bf5990b87412e5aa71c3 100644 (file)
--- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
+++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
@@ -151,6 +151,20 @@ struct mt8188_mt6359_priv {
        struct snd_soc_jack hdmi_jack;
 };
 
+static struct snd_soc_jack_pin mt8188_hdmi_jack_pins[] = {
+       {
+               .pin = "HDMI",
+               .mask = SND_JACK_LINEOUT,
+       },
+};
+
+static struct snd_soc_jack_pin mt8188_dp_jack_pins[] = {
+       {
+               .pin = "DP",
+               .mask = SND_JACK_LINEOUT,
+       },
+};
+
 struct mt8188_card_data {
        const char *name;
        unsigned long quirk;
@@ -159,6 +173,8 @@ struct mt8188_card_data {
 static const struct snd_soc_dapm_widget mt8188_mt6359_widgets[] = {
        SND_SOC_DAPM_HP("Headphone", NULL),
        SND_SOC_DAPM_MIC("Headset Mic", NULL),
+       SND_SOC_DAPM_SINK("HDMI"),
+       SND_SOC_DAPM_SINK("DP"),
 };
 
 static const struct snd_kcontrol_new mt8188_mt6359_controls[] = {
@@ -396,8 +412,10 @@ static int mt8188_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
        int ret = 0;
 
-       ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT,
-                                   &priv->hdmi_jack);
+       ret = snd_soc_card_jack_new_pins(rtd->card, "HDMI Jack",
+                                        SND_JACK_LINEOUT, &priv->hdmi_jack,
+                                        mt8188_hdmi_jack_pins,
+                                        ARRAY_SIZE(mt8188_hdmi_jack_pins));
        if (ret) {
                dev_info(rtd->dev, "%s, new jack failed: %d\n", __func__, ret);
                return ret;
@@ -417,8 +435,9 @@ static int mt8188_dptx_codec_init(struct snd_soc_pcm_runtime *rtd)
        struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component;
        int ret = 0;
 
-       ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_LINEOUT,
-                                   &priv->dp_jack);
+       ret = snd_soc_card_jack_new_pins(rtd->card, "DP Jack", SND_JACK_LINEOUT,
+                                        &priv->dp_jack, mt8188_dp_jack_pins,
+                                        ARRAY_SIZE(mt8188_dp_jack_pins));
        if (ret) {
                dev_info(rtd->dev, "%s, new jack failed: %d\n", __func__, ret);
                return ret;