ASoC: mediatek: mt8186-rt1019: Migrate to the common mtk_soundcard_startup

Add a const mtk_pcm_constraints_data struct array with all of the
(again, constant) constraints for all of the supported usecases,
remove the duplicated functions and call mtk_soundcard_startup()
instead in all of the .startup() callbacks.

Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20240416071410.75620-11-angelogioacchino.delregno@collabora.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
index f8856a100b27655023be34c5574782657ebb4ae0..28140ca0ebff8b5881383816b8900a58e735fcd7 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
+++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c
@@ -332,98 +332,6 @@ static int mt8186_sof_dai_link_fixup(struct snd_soc_pcm_runtime *rtd,
        return ret;
 }
 
-static int mt8186_mt6366_rt1019_rt5682s_playback_startup(struct snd_pcm_substream *substream)
-{
-       static const unsigned int rates[] = {
-               48000
-       };
-       static const unsigned int channels[] = {
-               2
-       };
-       static const struct snd_pcm_hw_constraint_list constraints_rates = {
-               .count = ARRAY_SIZE(rates),
-               .list  = rates,
-               .mask = 0,
-       };
-       static const struct snd_pcm_hw_constraint_list constraints_channels = {
-               .count = ARRAY_SIZE(channels),
-               .list  = channels,
-               .mask = 0,
-       };
-
-       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
-       struct snd_pcm_runtime *runtime = substream->runtime;
-       int ret;
-
-       ret = snd_pcm_hw_constraint_list(runtime, 0,
-                                        SNDRV_PCM_HW_PARAM_RATE,
-                                        &constraints_rates);
-       if (ret < 0) {
-               dev_err(rtd->dev, "hw_constraint_list rate failed\n");
-               return ret;
-       }
-
-       ret = snd_pcm_hw_constraint_list(runtime, 0,
-                                        SNDRV_PCM_HW_PARAM_CHANNELS,
-                                        &constraints_channels);
-       if (ret < 0) {
-               dev_err(rtd->dev, "hw_constraint_list channel failed\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-static const struct snd_soc_ops mt8186_mt6366_rt1019_rt5682s_playback_ops = {
-       .startup = mt8186_mt6366_rt1019_rt5682s_playback_startup,
-};
-
-static int mt8186_mt6366_rt1019_rt5682s_capture_startup(struct snd_pcm_substream *substream)
-{
-       static const unsigned int rates[] = {
-               48000
-       };
-       static const unsigned int channels[] = {
-               1, 2
-       };
-       static const struct snd_pcm_hw_constraint_list constraints_rates = {
-               .count = ARRAY_SIZE(rates),
-               .list  = rates,
-               .mask = 0,
-       };
-       static const struct snd_pcm_hw_constraint_list constraints_channels = {
-               .count = ARRAY_SIZE(channels),
-               .list  = channels,
-               .mask = 0,
-       };
-
-       struct snd_soc_pcm_runtime *rtd = snd_soc_substream_to_rtd(substream);
-       struct snd_pcm_runtime *runtime = substream->runtime;
-       int ret;
-
-       ret = snd_pcm_hw_constraint_list(runtime, 0,
-                                        SNDRV_PCM_HW_PARAM_RATE,
-                                        &constraints_rates);
-       if (ret < 0) {
-               dev_err(rtd->dev, "hw_constraint_list rate failed\n");
-               return ret;
-       }
-
-       ret = snd_pcm_hw_constraint_list(runtime, 0,
-                                        SNDRV_PCM_HW_PARAM_CHANNELS,
-                                        &constraints_channels);
-       if (ret < 0) {
-               dev_err(rtd->dev, "hw_constraint_list channel failed\n");
-               return ret;
-       }
-
-       return 0;
-}
-
-static const struct snd_soc_ops mt8186_mt6366_rt1019_rt5682s_capture_ops = {
-       .startup = mt8186_mt6366_rt1019_rt5682s_capture_startup,
-};
-
 /* FE */
 SND_SOC_DAILINK_DEFS(playback1,
                     DAILINK_COMP_ARRAY(COMP_CPU("DL1")),
@@ -644,7 +552,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
-               .ops = &mt8186_mt6366_rt1019_rt5682s_playback_ops,
+               .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(playback1),
        },
        {
@@ -678,7 +586,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
-               .ops = &mt8186_mt6366_rt1019_rt5682s_playback_ops,
+               .ops = &mtk_soundcard_common_playback_ops,
                SND_SOC_DAILINK_REG(playback3),
        },
        {
@@ -745,7 +653,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
-               .ops = &mt8186_mt6366_rt1019_rt5682s_capture_ops,
+               .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(capture2),
        },
        {
@@ -767,7 +675,7 @@ static struct snd_soc_dai_link mt8186_mt6366_rt1019_rt5682s_dai_links[] = {
                .dpcm_merged_format = 1,
                .dpcm_merged_chan = 1,
                .dpcm_merged_rate = 1,
-               .ops = &mt8186_mt6366_rt1019_rt5682s_capture_ops,
+               .ops = &mtk_soundcard_common_capture_ops,
                SND_SOC_DAILINK_REG(capture4),
        },
        {
@@ -1220,6 +1128,32 @@ static int mt8186_mt6366_soc_card_probe(struct mtk_soc_card_data *soc_card_data,
        return 0;
 }
 
+static const unsigned int mt8186_pcm_playback_channels[] = { 2 };
+static const unsigned int mt8186_pcm_capture_channels[] = { 1, 2 };
+static const unsigned int mt8186_pcm_rates[] = { 48000 };
+
+static const struct snd_pcm_hw_constraint_list mt8186_rate_constraint = {
+       .list = mt8186_pcm_rates,
+       .count = ARRAY_SIZE(mt8186_pcm_rates)
+};
+
+static const struct mtk_pcm_constraints_data mt8186_pcm_constraints[MTK_CONSTRAINT_CAPTURE + 1] = {
+       [MTK_CONSTRAINT_PLAYBACK] = {
+               .channels = &(const struct snd_pcm_hw_constraint_list) {
+                       .list = mt8186_pcm_playback_channels,
+                       .count = ARRAY_SIZE(mt8186_pcm_playback_channels)
+               },
+               .rates = &mt8186_rate_constraint,
+       },
+       [MTK_CONSTRAINT_CAPTURE] = {
+               .channels = &(const struct snd_pcm_hw_constraint_list) {
+                       .list = mt8186_pcm_capture_channels,
+                       .count = ARRAY_SIZE(mt8186_pcm_capture_channels)
+               },
+               .rates = &mt8186_rate_constraint,
+       }
+};
+
 static const struct mtk_sof_priv mt8186_sof_priv = {
        .conn_streams = g_sof_conn_streams,
        .num_streams = ARRAY_SIZE(g_sof_conn_streams),
@@ -1230,6 +1164,8 @@ static const struct mtk_soundcard_pdata mt8186_mt6366_rt1019_rt5682s_pdata = {
        .card_data = &(struct mtk_platform_card_data) {
                .card = &mt8186_mt6366_rt1019_rt5682s_soc_card,
                .num_jacks = MT8186_JACK_MAX,
+               .pcm_constraints = mt8186_pcm_constraints,
+               .num_pcm_constraints = ARRAY_SIZE(mt8186_pcm_constraints),
        },
        .sof_priv = &mt8186_sof_priv,
        .soc_probe = mt8186_mt6366_soc_card_probe
@@ -1239,6 +1175,8 @@ static const struct mtk_soundcard_pdata mt8186_mt6366_rt5682s_max98360_pdata = {
        .card_data = &(struct mtk_platform_card_data) {
                .card = &mt8186_mt6366_rt5682s_max98360_soc_card,
                .num_jacks = MT8186_JACK_MAX,
+               .pcm_constraints = mt8186_pcm_constraints,
+               .num_pcm_constraints = ARRAY_SIZE(mt8186_pcm_constraints),
        },
        .sof_priv = &mt8186_sof_priv,
        .soc_probe = mt8186_mt6366_soc_card_probe
@@ -1248,6 +1186,8 @@ static const struct mtk_soundcard_pdata mt8186_mt6366_rt5650_pdata = {
        .card_data = &(struct mtk_platform_card_data) {
                .card = &mt8186_mt6366_rt5650_soc_card,
                .num_jacks = MT8186_JACK_MAX,
+               .pcm_constraints = mt8186_pcm_constraints,
+               .num_pcm_constraints = ARRAY_SIZE(mt8186_pcm_constraints),
        },
        .sof_priv = &mt8186_sof_priv,
        .soc_probe = mt8186_mt6366_soc_card_probe