ASoC: Intel: sof_ssp_amp: use common module for BT offload link
authorBrent Lu <brent.lu@intel.com>
Mon, 27 Nov 2023 15:26:47 +0000 (17:26 +0200)
committerMark Brown <broonie@kernel.org>
Mon, 27 Nov 2023 16:33:04 +0000 (16:33 +0000)
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-21-peter.ujfalusi@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/intel/boards/sof_ssp_amp.c

index c463bc698c10541814438cc2448e90210e3d185c..72505f6a650136d9417b8f4625e6bb9d844db4c5 100644 (file)
@@ -215,29 +215,14 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec amp_type,
                int port = (sof_ssp_amp_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;
-devm_err:
-       return NULL;
 }
 
 static int sof_ssp_amp_probe(struct platform_device *pdev)
@@ -261,6 +246,10 @@ static int sof_ssp_amp_probe(struct platform_device *pdev)
        else
                ctx->dmic_be_num = 0;
 
+       /* port number of peripherals attached to ssp interface */
+       ctx->ssp_bt = (sof_ssp_amp_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>
+                       SOF_BT_OFFLOAD_SSP_SHIFT;
+
        ctx->ssp_amp = sof_ssp_amp_quirk & SOF_AMPLIFIER_SSP_MASK;
 
        /* set number of dai links */
@@ -288,8 +277,10 @@ static int sof_ssp_amp_probe(struct platform_device *pdev)
                ctx->hdmi_num = 0;
        }
 
-       if (sof_ssp_amp_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)
+       if (sof_ssp_amp_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
+               ctx->bt_offload_present = true;
                sof_ssp_amp_card.num_links++;
+       }
 
        dai_links = sof_card_dai_links_create(&pdev->dev, ctx->amp_type,
                                              ctx->ssp_amp, ctx->dmic_be_num,