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

[linux-2.6-microblaze.git] / sound / soc / intel / boards / sof_rt5682.c

diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c
index 777d1db..22dd851 100644 (file)
--- a/sound/soc/intel/boards/sof_rt5682.c
+++ b/sound/soc/intel/boards/sof_rt5682.c
@@ -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 +=