From 21fcd44b41c2b24a1a17c94e05471fee58e618b0 Mon Sep 17 00:00:00 2001 From: Bard Liao Date: Wed, 8 Oct 2025 10:49:12 +0800 Subject: [PATCH] Revert "ASoC: Intel: sof_sdw: create SSP BT DAI if bt_link_mask sets" This reverts commit af0aefcb220cf7fff87502ff4081d5f22d41fd70. --- sound/soc/intel/boards/sof_sdw.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 36cf7e51b72dfa..d7ec67ce184c67 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -15,10 +15,8 @@ #include #include #include - #include "sof_sdw_common.h" #include "../../codecs/rt711.h" -#include "../../sof/intel/hda.h" static unsigned long sof_sdw_quirk = RT711_JD1; static int quirk_override = -1; @@ -1145,28 +1143,8 @@ static int create_bt_dailinks(struct snd_soc_card *card, struct snd_soc_dai_link **dai_links, int *be_id) { struct device *dev = card->dev; - struct snd_soc_acpi_mach *mach = dev_get_platdata(dev); - const struct sof_intel_dsp_desc *chip = get_chip_info(snd_soc_card_get_drvdata(card)); - int port; - - if (!mach || !chip) - return -EINVAL; - - port = (sof_sdw_quirk & SOF_BT_OFFLOAD_SSP_MASK) >> + int port = (sof_sdw_quirk & SOF_BT_OFFLOAD_SSP_MASK) >> SOF_BT_OFFLOAD_SSP_SHIFT; - - /* Use the bt_link_mask from module parameters if provided - * and if the SoC hardware IP version is ACE4 or newer. - * This allows platform data to override which SSP is used - * for Bluetooth offload. - */ - if (mach->mach_params.bt_link_mask && - chip->hw_ip_version >= SOF_INTEL_ACE_4_0) { - port = __ffs(mach->mach_params.bt_link_mask); - dev_info(dev, "BT: using bt_link_mask override, SSP%d selected (ACE4+)\n", - port); - } - char *name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d-BT", port); char *cpu_dai_name = devm_kasprintf(dev, GFP_KERNEL, "SSP%d Pin", port); if (!name || !cpu_dai_name)