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

index 777d1db5c6ad3dbedcbd580c7aa57040a4a7f6eb..22dd85129a515d9930d3aec68281f1d4b33e3a06 100644 (file)
@@ -720,23 +720,11 @@ sof_card_dai_links_create(struct device *dev, enum sof_ssp_codec codec_type,
                int port = (sof_rt5682_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++;
        }
 
        /* HDMI-In SSP */
@@ -843,6 +831,10 @@ static int sof_audio_probe(struct platform_device *pdev)
 
        dev_dbg(&pdev->dev, "sof_rt5682_quirk = %lx\n", sof_rt5682_quirk);
 
+       /* port number of peripherals attached to ssp interface */
+       ctx->ssp_bt = (sof_rt5682_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>
+                       SOF_BT_OFFLOAD_SSP_SHIFT;
+
        ctx->ssp_amp = (sof_rt5682_quirk & SOF_RT5682_SSP_AMP_MASK) >>
                        SOF_RT5682_SSP_AMP_SHIFT;
 
@@ -854,8 +846,10 @@ static int sof_audio_probe(struct platform_device *pdev)
        if (ctx->amp_type != CODEC_NONE)
                sof_audio_card_rt5682.num_links++;
 
-       if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT)
+       if (sof_rt5682_quirk & SOF_SSP_BT_OFFLOAD_PRESENT) {
+               ctx->bt_offload_present = true;
                sof_audio_card_rt5682.num_links++;
+       }
 
        if (sof_rt5682_quirk & SOF_SSP_HDMI_CAPTURE_PRESENT_MASK)
                sof_audio_card_rt5682.num_links +=