Skip to content

Revert "ASoC: Intel: sof_sdw: create SSP BT DAI if bt_link_mask sets" #5553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ujfalusi merged 1 commit into from
Oct 8, 2025
Merged

Revert "ASoC: Intel: sof_sdw: create SSP BT DAI if bt_link_mask sets" #5553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 1 addition & 23 deletions sound/soc/intel/boards/sof_sdw.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@
#include <linux/soundwire/sdw_intel.h>
#include <sound/core.h>
#include <sound/soc-acpi.h>

#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;
Expand Down Expand Up @@ -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)
Expand Down
Loading