ASoC: mediatek: mt8183-mt6358-ts3a227-max98357: Map missing jack kcontrols

This driver does not properly map jack pins to kcontrols that PulseAudio
and PipeWire need to handle jack detection events. The TS3A227 component
used here can detect Headphones and Headset Mic connections. Expose each
to userspace as kcontrols and add the necessary widgets.

Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com>
Link: https://lore.kernel.org/r/20230802175737.263412-18-alpernebiyasak@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
index ce9aedde7e1eff1e8f8d935d881e87a427bbc59f..850f4d949d9785455da663853daab7de0e2a8580 100644 (file)
--- a/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c
@@ -592,11 +592,38 @@ static struct snd_soc_dai_link mt8183_mt6358_ts3a227_dai_links[] = {
        },
 };
 
+static const
+struct snd_kcontrol_new mt8183_mt6358_ts3a227_max98357_snd_controls[] = {
+       SOC_DAPM_PIN_SWITCH("Headphone"),
+       SOC_DAPM_PIN_SWITCH("Headset Mic"),
+};
+
+static const
+struct snd_soc_dapm_widget mt8183_mt6358_ts3a227_max98357_dapm_widgets[] = {
+       SND_SOC_DAPM_HP("Headphone", NULL),
+       SND_SOC_DAPM_MIC("Headset Mic", NULL),
+};
+
+static struct snd_soc_jack_pin mt8183_mt6358_ts3a227_max98357_jack_pins[] = {
+       {
+               .pin    = "Headphone",
+               .mask   = SND_JACK_HEADPHONE,
+       },
+       {
+               .pin    = "Headset Mic",
+               .mask   = SND_JACK_MICROPHONE,
+       },
+};
+
 static struct snd_soc_card mt8183_mt6358_ts3a227_max98357_card = {
        .name = "mt8183_mt6358_ts3a227_max98357",
        .owner = THIS_MODULE,
        .dai_link = mt8183_mt6358_ts3a227_dai_links,
        .num_links = ARRAY_SIZE(mt8183_mt6358_ts3a227_dai_links),
+       .controls = mt8183_mt6358_ts3a227_max98357_snd_controls,
+       .num_controls = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_snd_controls),
+       .dapm_widgets = mt8183_mt6358_ts3a227_max98357_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_dapm_widgets),
 };
 
 static struct snd_soc_card mt8183_mt6358_ts3a227_max98357b_card = {
@@ -604,6 +631,10 @@ static struct snd_soc_card mt8183_mt6358_ts3a227_max98357b_card = {
        .owner = THIS_MODULE,
        .dai_link = mt8183_mt6358_ts3a227_dai_links,
        .num_links = ARRAY_SIZE(mt8183_mt6358_ts3a227_dai_links),
+       .controls = mt8183_mt6358_ts3a227_max98357_snd_controls,
+       .num_controls = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_snd_controls),
+       .dapm_widgets = mt8183_mt6358_ts3a227_max98357_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_dapm_widgets),
 };
 
 static struct snd_soc_codec_conf mt8183_mt6358_ts3a227_rt1015_amp_conf[] = {
@@ -624,6 +655,10 @@ static struct snd_soc_card mt8183_mt6358_ts3a227_rt1015_card = {
        .num_links = ARRAY_SIZE(mt8183_mt6358_ts3a227_dai_links),
        .codec_conf = mt8183_mt6358_ts3a227_rt1015_amp_conf,
        .num_configs = ARRAY_SIZE(mt8183_mt6358_ts3a227_rt1015_amp_conf),
+       .controls = mt8183_mt6358_ts3a227_max98357_snd_controls,
+       .num_controls = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_snd_controls),
+       .dapm_widgets = mt8183_mt6358_ts3a227_max98357_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_dapm_widgets),
 };
 
 static struct snd_soc_card mt8183_mt6358_ts3a227_rt1015p_card = {
@@ -631,6 +666,10 @@ static struct snd_soc_card mt8183_mt6358_ts3a227_rt1015p_card = {
        .owner = THIS_MODULE,
        .dai_link = mt8183_mt6358_ts3a227_dai_links,
        .num_links = ARRAY_SIZE(mt8183_mt6358_ts3a227_dai_links),
+       .controls = mt8183_mt6358_ts3a227_max98357_snd_controls,
+       .num_controls = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_snd_controls),
+       .dapm_widgets = mt8183_mt6358_ts3a227_max98357_dapm_widgets,
+       .num_dapm_widgets = ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_dapm_widgets),
 };
 
 static int
@@ -641,12 +680,14 @@ mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *component)
                        snd_soc_card_get_drvdata(component->card);
 
        /* Enable Headset and 4 Buttons Jack detection */
-       ret = snd_soc_card_jack_new(component->card,
-                                   "Headset Jack",
-                                   SND_JACK_HEADSET |
-                                   SND_JACK_BTN_0 | SND_JACK_BTN_1 |
-                                   SND_JACK_BTN_2 | SND_JACK_BTN_3,
-                                   &priv->headset_jack);
+       ret = snd_soc_card_jack_new_pins(component->card,
+                                        "Headset Jack",
+                                        SND_JACK_HEADSET |
+                                        SND_JACK_BTN_0 | SND_JACK_BTN_1 |
+                                        SND_JACK_BTN_2 | SND_JACK_BTN_3,
+                                        &priv->headset_jack,
+                                        mt8183_mt6358_ts3a227_max98357_jack_pins,
+                                        ARRAY_SIZE(mt8183_mt6358_ts3a227_max98357_jack_pins));
        if (ret)
                return ret;