ASoC: Intel: sof_nau8825: use common module for BT offload link

Use intel_board module for BT offload DAI link initialization.

Signed-off-by: Brent Lu <brent.lu@intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Link: https://lore.kernel.org/r/20231127152654.28204-19-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 cc2a11b3de977f7b54cd7a65e7bd4e58f708103b..32a43d1b584640e6bc53b1caa4f245b95031f7c1 100644 (file)
--- a/sound/soc/intel/boards/sof_nau8825.c
+++ b/sound/soc/intel/boards/sof_nau8825.c
@@ -138,13 +138,6 @@ static struct snd_soc_ops sof_nau8825_ops = {
        .hw_params = sof_nau8825_hw_params,
 };
 
-static struct snd_soc_dai_link_component platform_component[] = {
-       {
-               /* name might be overridden during probe */
-               .name = "0000:00:1f.3"
-       }
-};
-
 static int sof_card_late_probe(struct snd_soc_card *card)
 {
        struct sof_card_private *ctx = snd_soc_card_get_drvdata(card);
@@ -212,7 +205,6 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
                          int ssp_codec, int ssp_amp, int dmic_be_num,
                          int hdmi_num, bool idisp_codec)
 {
-       struct snd_soc_dai_link_component *cpus;
        struct snd_soc_dai_link *links;
        int i;
        int id = 0;
@@ -220,9 +212,7 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
 
        links = devm_kcalloc(dev, sof_audio_card_nau8825.num_links,
                            sizeof(struct snd_soc_dai_link), GFP_KERNEL);
-       cpus = devm_kcalloc(dev, sof_audio_card_nau8825.num_links,
-                           sizeof(struct snd_soc_dai_link_component), GFP_KERNEL);
-       if (!links || !cpus)
+       if (!links)
                goto devm_err;
 
        /* codec SSP */
@@ -311,23 +301,11 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
                int port = (sof_nau8825_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>
                                SOF_BT_OFFLOAD_SSP_SHIFT;
 
-               links[id].id = id;
-               links[id].cpus = &cpus[id];
-               links[id].cpus->dai_name = devm_kasprintf(dev, GFP_KERNEL,
-                                                         "SSP%d Pin", port);
-               if (!links[id].cpus->dai_name)
-                       goto devm_err;
-               links[id].name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port);
-               if (!links[id].name)
-                       goto devm_err;
-               links[id].codecs = &snd_soc_dummy_dlc;
-               links[id].num_codecs = 1;
-               links[id].platforms = platform_component;
-               links[id].num_platforms = ARRAY_SIZE(platform_component);
-               links[id].dpcm_playback = 1;
-               links[id].dpcm_capture = 1;
-               links[id].no_pcm = 1;
-               links[id].num_cpus = 1;
+               ret = sof_intel_board_set_bt_link(dev, &links[id], id, port);
+               if (ret)
+                       return NULL;
+
+               id++;
        }
 
        return links;
@@ -365,6 +343,10 @@ static int sof_audio_probe(struct platform_device *pdev)
        if (mach->mach_params.codec_mask & IDISP_CODEC_MASK)
                ctx->hdmi.idisp_codec = true;
 
+       /* port number of peripherals attached to ssp interface */
+       ctx->ssp_bt = (sof_nau8825_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>
+                       SOF_BT_OFFLOAD_SSP_SHIFT;
+
        ctx->ssp_amp = (sof_nau8825_quirk & SOF_NAU8825_SSP_AMP_MASK) >>
                        SOF_NAU8825_SSP_AMP_SHIFT;
 
@@ -376,8 +358,10 @@ static int sof_audio_probe(struct platform_device *pdev)
        if (ctx->amp_type != CODEC_NONE)
                sof_audio_card_nau8825.num_links++;
 
-       if (sof_nau8825_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)
+       if (sof_nau8825_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
+               ctx->bt_offload_present = true;
                sof_audio_card_nau8825.num_links++;
+       }
 
        dai_links = sof_card_dai_links_create(&pdev->dev, ctx->amp_type,
                                              ctx->ssp_codec, ctx->ssp_amp,