Skip to content

ASoC: SOF: Intel: hda: add SDCA property check #5652

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

Open
macchian wants to merge 2 commits into
base: topic/sof-dev
Choose a base branch
from
Open

ASoC: SOF: Intel: hda: add SDCA property check #5652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbb7196
ASoC: SOF: Intel: hda: add SDCA property check
macchian Jan 14, 2026
eabcc9e
ASoC: Intel: soc-acpi-intel-ptl-match: drop rt721_l3 match table
macchian Jan 16, 2026
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
16 changes: 0 additions & 16 deletions sound/soc/intel/common/soc-acpi-intel-ptl-match.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,15 +374,6 @@ static const struct snd_soc_acpi_adr_device rt721_3_single_adr[] = {
}
};

static const struct snd_soc_acpi_link_adr ptl_rt721_l3[] = {
{
.mask = BIT(3),
.num_adr = ARRAY_SIZE(rt721_3_single_adr),
.adr_d = rt721_3_single_adr,
},
{},
};

static const struct snd_soc_acpi_adr_device rt722_0_agg_adr[] = {
{
.adr = 0x000030025d072201ull,
Expand Down Expand Up @@ -763,13 +754,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ptl_sdw_machines[] = {
.sof_tplg_filename = "sof-ptl-rt712-l3-rt1320-l3.tplg",
.get_function_tplg_files = sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(3),
.links = ptl_rt721_l3,
.drv_name = "sof_sdw",
.sof_tplg_filename = "sof-ptl-rt721.tplg",
Copy link
Collaborator

@bardliao bardliao Jan 22, 2026

Choose a reason for hiding this comment

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

sof-ptl-rt721.tplg is already in https://github.com/thesofproject/sof-bin/tree/main/v2.14.x/sof-ipc4-tplg-v2.14. It will use function topology even if we don't remove the item. Not sure if we want to remove this. @ujfalusi @kv2019i What do you think?

Copy link
Author

@macchian macchian Jan 23, 2026

Choose a reason for hiding this comment

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

@bardliao , in the match table, sof-ptl-rt721.tplg has high priority to use, isn't it ? Or did I miss any related patch?

Copy link
Collaborator

@bardliao bardliao Jan 23, 2026

Choose a reason for hiding this comment

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

No, sof-ptl-rt721.tplg is a fallback when not all required function topologies are found in the file system.

.get_function_tplg_files = sof_sdw_get_tplg_files,
},
{
.link_mask = BIT(3),
.links = ptl_rt722_l3,
Expand Down
6 changes: 6 additions & 0 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,12 @@ static bool is_endpoint_present(struct sdw_slave *sdw_device,
{
int i;

/* If SDCA is not present, assume the endpoint is present */
if (!sdw_device->sdca_data.interface_revision) {
dev_warn(&sdw_device->dev, "SDCA properties not found in BIOS\n");
return true;
}

for (i = 0; i < sdw_device->sdca_data.num_functions; i++) {
if (dai_type == dai_info->dais[i].dai_type)
return true;
Expand Down
Loading