ASoC: Intel: sof_nau8825: use common module for amp link

Use intel_board module for speaker amplifier DAI link initialization.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20231127152654.28204-13-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/boards/sof_nau8825.c b/sound/soc/intel/boards/sof_nau8825.c
index 3aeed23c8d0d81b535bceecf3048c124538ac799..cc2a11b3de977f7b54cd7a65e7bd4e58f708103b 100644 (file)
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -273,13 +273,12 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
 
        /* speaker amp */
        if (amp_type != CODEC_NONE) {
-               links[id].name = devm_kasprintf(dev, GFP_KERNEL,
-                                               "SSP%d-Codec", ssp_amp);
-               if (!links[id].name)
-                       goto devm_err;
-
-               links[id].id = id;
+               ret = sof_intel_board_set_ssp_amp_link(dev, &links[id], id,
+                                                      amp_type, ssp_amp);
+               if (ret)
+                       return NULL;
 
+               /* codec-specific fields */
                switch (amp_type) {
                case CODEC_MAX98360A:
                        max_98360a_dai_link(&links[id]);
@@ -304,20 +303,6 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
                        return NULL;
                }
 
-               links[id].platforms = platform_component;
-               links[id].num_platforms = ARRAY_SIZE(platform_component);
-               links[id].dpcm_playback = 1;
-               /* feedback stream or firmware-generated echo reference */
-               links[id].dpcm_capture = 1;
-
-               links[id].no_pcm = 1;
-               links[id].cpus = &cpus[id];
-               links[id].num_cpus = 1;
-               links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
-                                                         "SSP%d Pin",
-                                                         ssp_amp);
-               if (!links[id].cpus->dai_name)
-                       goto devm_err;
                id++;
        }
 
@@ -355,7 +340,7 @@ static int sof_audio_probe(struct platform_device *pdev)
        struct snd_soc_acpi_mach *mach = pdev->dev.platform_data;
        struct snd_soc_dai_link *dai_links;
        struct sof_card_private *ctx;
-       int ret, ssp_amp;
+       int ret;
 
        ctx = devm_kzalloc(&pdev->dev, sizeof(*ctx), GFP_KERNEL);
        if (!ctx)
@@ -380,7 +365,7 @@ static int sof_audio_probe(struct platform_device *pdev)
        if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)
                ctx->hdmi.idisp_codec = true;
 
-       ssp_amp = (sof_nau8825_quirk & SOF_NAU8825_SSP_AMP_MASK) >>
+       ctx->ssp_amp = (sof_nau8825_quirk & SOF_NAU8825_SSP_AMP_MASK) >>
                        SOF_NAU8825_SSP_AMP_SHIFT;
 
        ctx->ssp_codec = sof_nau8825_quirk & SOF_NAU8825_SSP_CODEC_MASK;
@@ -395,7 +380,7 @@ static int sof_audio_probe(struct platform_device *pdev)
                sof_audio_card_nau8825.num_links++;
 
        dai_links = sof_card_dai_links_create(&pdev->dev, ctx->amp_type,
-                                             ctx->ssp_codec, ssp_amp,
+                                             ctx->ssp_codec, ctx->ssp_amp,
                                              ctx->dmic_be_num, ctx->hdmi_num,
                                              ctx->hdmi.idisp_codec);
        if (!dai_links)