Skip to content

ASoC: Intel: soc-acpi-intel-ptl-match: Add support for rt722_l0_rt132… #5501

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
bardliao merged 4 commits into from
Oct 2, 2025
Merged

ASoC: Intel: soc-acpi-intel-ptl-match: Add support for rt722_l0_rt132… #5501

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b669e8
fixup! ASoC: Intel: sof_sdw: shift SSP BT mask bits.
macchian Sep 23, 2025
c598773
ASoC: Intel: soc-acpi-intel-ptl-match: Add support for rt722_l0_rt132…
macchian Aug 28, 2025
576e368
ASoC: Intel: sof_sdw: Add quirk to exclude RT722 speaker
macchian Aug 29, 2025
00acb4a
ASoC: Intel: sof_sdw: create SSP BT DAI if bt_link_mask sets
macchian Sep 18, 2025
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: 23 additions & 1 deletion 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,8 +15,10 @@
#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 @@ -1143,8 +1145,28 @@ 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;
int port = (sof_sdw_quirk & SOF_BT_OFFLOAD_SSP_MASK) >>
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) >>
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.
*/

@bardliao bardliao Sep 26, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sof_sdw_quirk could also from module parameter. Not sure which one should have higher priority.

@macchian macchian Sep 30, 2025

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Even when the sof_sdw_quirk override is used alone or together with bt_link_mask, it is the bt_link_mask that ultimately determines which topology with the BT prefix is loaded.

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