ASoC: mediatek: mt8192: refactor for I2S3 DAI link of speaker

As part of the refactoring to allow the same machine driver to be used for
the rt1015(p) and rt5682(s) codecs on the MT8192 platform, parse the
rt1015(p) codecs from the speaker-codecs property in the devicetree and
wire them to the I2S3 backend, instead of hardcoding the links and
selecting through the compatible.

Signed-off-by: Jiaxin Yu <jiaxin.yu@mediatek.com>
Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Tested-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/20220408060552.26607-3-jiaxin.yu@mediatek.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
index ee91569..1571144 100644 (file)
--- a/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
+++ b/sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c
@@ -604,17 +604,9 @@ SND_SOC_DAILINK_DEFS(i2s2,
                     DAILINK_COMP_ARRAY(COMP_DUMMY()),
                     DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
-SND_SOC_DAILINK_DEFS(i2s3_rt1015,
+SND_SOC_DAILINK_DEFS(i2s3,
                     DAILINK_COMP_ARRAY(COMP_CPU("I2S3")),
-                    DAILINK_COMP_ARRAY(COMP_CODEC(RT1015_DEV0_NAME,
-                                                  RT1015_CODEC_DAI),
-                                       COMP_CODEC(RT1015_DEV1_NAME,
-                                                  RT1015_CODEC_DAI)),
-                    DAILINK_COMP_ARRAY(COMP_EMPTY()));
-
-SND_SOC_DAILINK_DEFS(i2s3_rt1015p,
-                    DAILINK_COMP_ARRAY(COMP_CPU("I2S3")),
-                    DAILINK_COMP_ARRAY(COMP_CODEC("rt1015p", "HiFi")),
+                    DAILINK_COMP_ARRAY(COMP_EMPTY()),
                     DAILINK_COMP_ARRAY(COMP_EMPTY()));
 
 SND_SOC_DAILINK_DEFS(i2s5,
@@ -929,6 +921,7 @@ static struct snd_soc_dai_link mt8192_mt6359_dai_links[] = {
                .dpcm_playback = 1,
                .ignore_suspend = 1,
                .be_hw_params_fixup = mt8192_i2s_hw_params_fixup,
+               SND_SOC_DAILINK_REG(i2s3),
        },
        {
                .name = "I2S5",
@@ -1100,55 +1093,61 @@ static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682_card = {
        .num_dapm_routes = ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_routes),
 };
 
+static int mt8192_mt6359_card_set_be_link(struct snd_soc_card *card,
+                                         struct snd_soc_dai_link *link,
+                                         struct device_node *node,
+                                         char *link_name)
+{
+       int ret;
+
+       if (node && strcmp(link->name, link_name) == 0) {
+               ret = snd_soc_of_get_dai_link_codecs(card->dev, node, link);
+               if (ret < 0) {
+                       dev_err_probe(card->dev, ret, "get dai link codecs fail\n");
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
 {
        struct snd_soc_card *card;
-       struct device_node *platform_node, *hdmi_codec;
+       struct device_node *platform_node, *hdmi_codec, *speaker_codec;
        int ret, i;
        struct snd_soc_dai_link *dai_link;
        struct mt8192_mt6359_priv *priv;
 
-       platform_node = of_parse_phandle(pdev->dev.of_node,
-                                        "mediatek,platform", 0);
-       if (!platform_node) {
-               dev_err(&pdev->dev, "Property 'platform' missing or invalid\n");
+       card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
+       if (!card)
                return -EINVAL;
-       }
+       card->dev = &pdev->dev;
 
-       card = (struct snd_soc_card *)of_device_get_match_data(&pdev->dev);
-       if (!card) {
+       hdmi_codec = of_parse_phandle(pdev->dev.of_node, "mediatek,hdmi-codec", 0);
+       if (!hdmi_codec)
+               dev_dbg(&pdev->dev, "The machine has no hdmi-codec\n");
+
+       platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0);
+       if (!platform_node) {
                ret = -EINVAL;
-               goto put_platform_node;
+               dev_err_probe(&pdev->dev, ret, "Property 'platform' missing or invalid\n");
+               goto err_platform_node;
        }
-       card->dev = &pdev->dev;
 
-       hdmi_codec = of_parse_phandle(pdev->dev.of_node,
-                                     "mediatek,hdmi-codec", 0);
+       speaker_codec = of_get_child_by_name(pdev->dev.of_node, "speaker-codecs");
+       if (!speaker_codec) {
+               ret = -EINVAL;
+               dev_err_probe(&pdev->dev, ret, "Property 'speaker-codecs' missing or invalid\n");
+               goto err_speaker_codec;
+       }
 
        for_each_card_prelinks(card, i, dai_link) {
-               if (strcmp(dai_link->name, "I2S3") == 0) {
-                       if (card == &mt8192_mt6359_rt1015_rt5682_card) {
-                               dai_link->ops = &mt8192_rt1015_i2s_ops;
-                               dai_link->cpus = i2s3_rt1015_cpus;
-                               dai_link->num_cpus =
-                                       ARRAY_SIZE(i2s3_rt1015_cpus);
-                               dai_link->codecs = i2s3_rt1015_codecs;
-                               dai_link->num_codecs =
-                                       ARRAY_SIZE(i2s3_rt1015_codecs);
-                               dai_link->platforms = i2s3_rt1015_platforms;
-                               dai_link->num_platforms =
-                                       ARRAY_SIZE(i2s3_rt1015_platforms);
-                       } else if (card == &mt8192_mt6359_rt1015p_rt5682_card) {
-                               dai_link->cpus = i2s3_rt1015p_cpus;
-                               dai_link->num_cpus =
-                                       ARRAY_SIZE(i2s3_rt1015p_cpus);
-                               dai_link->codecs = i2s3_rt1015p_codecs;
-                               dai_link->num_codecs =
-                                       ARRAY_SIZE(i2s3_rt1015p_codecs);
-                               dai_link->platforms = i2s3_rt1015p_platforms;
-                               dai_link->num_platforms =
-                                       ARRAY_SIZE(i2s3_rt1015p_platforms);
-                       }
+               ret = mt8192_mt6359_card_set_be_link(card, dai_link, speaker_codec, "I2S3");
+               if (ret) {
+                       dev_err_probe(&pdev->dev, ret, "%s set speaker_codec fail\n",
+                                     dai_link->name);
+                       goto err_probe;
                }
 
                if (hdmi_codec && strcmp(dai_link->name, "TDM") == 0) {
@@ -1156,6 +1155,9 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
                        dai_link->ignore = 0;
                }
 
+               if (strcmp(dai_link->codecs[0].dai_name, RT1015_CODEC_DAI) == 0)
+                       dai_link->ops = &mt8192_rt1015_i2s_ops;
+
                if (!dai_link->platforms->name)
                        dai_link->platforms->of_node = platform_node;
        }
@@ -1163,22 +1165,26 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev)
        priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv) {
                ret = -ENOMEM;
-               goto put_hdmi_codec;
+               goto err_probe;
        }
        snd_soc_card_set_drvdata(card, priv);
 
        ret = mt8192_afe_gpio_init(&pdev->dev);
        if (ret) {
-               dev_err(&pdev->dev, "init gpio error %d\n", ret);
-               goto put_hdmi_codec;
+               dev_err_probe(&pdev->dev, ret, "%s init gpio error\n", __func__);
+               goto err_probe;
        }
 
        ret = devm_snd_soc_register_card(&pdev->dev, card);
+       if (ret)
+               dev_err_probe(&pdev->dev, ret, "%s snd_soc_register_card fail\n", __func__);
 
-put_hdmi_codec:
-       of_node_put(hdmi_codec);
-put_platform_node:
+err_probe:
+       of_node_put(speaker_codec);
+err_speaker_codec:
        of_node_put(platform_node);
+err_platform_node:
+       of_node_put(hdmi_codec);
        return ret;
 }