Skip to content

Fixup Use sof sdw as default sdw machine #5552

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 3 commits into from
Oct 8, 2025
Merged

Fixup Use sof sdw as default sdw machine #5552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0804018
fixup! ASoC: SOF: Don't print the monolithic topology name if functio…
bardliao Oct 7, 2025
b2cbf7d
fixup! ASoC: SOF: Intel: use sof_sdw as default SDW machine driver
bardliao Oct 7, 2025
bd91d03
fixup! ASoC: sof-function-topology-lib: escalate the log when missing…
bardliao Oct 7, 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
2 changes: 1 addition & 1 deletion sound/soc/intel/common/sof-function-topology-lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ int sof_sdw_get_tplg_files(struct snd_soc_card *card, const struct snd_soc_acpi_
"Failed to open topology file: %s, you might need to\n",
(*tplg_files)[i]);
dev_warn(card->dev,
"download it from https://github.com/thesofproject/sof-bin/\n");
"download it from https://github.com/thesofproject/sof-bin/\n");
return 0;
}
}
Expand Down
5 changes: 3 additions & 2 deletions sound/soc/sof/fw-file-profile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,11 @@ static void sof_print_profile_info(struct snd_sof_dev *sdev,
if (profile->fw_lib_path)
dev_info(dev, " Firmware lib path: %s\n", profile->fw_lib_path);

if(plat_data->machine->get_function_tplg_files && !plat_data->disable_function_topology)
if (plat_data->machine->get_function_tplg_files && !plat_data->disable_function_topology)
dev_info(dev, " Topology file: function topologies\n");
else
dev_info(dev, " Topology file: %s/%s\n", profile->tplg_path, profile->tplg_name);
dev_info(dev, " Topology file: %s/%s\n",
profile->tplg_path, profile->tplg_name);
}

int sof_create_ipc_file_profile(struct snd_sof_dev *sdev,
Expand Down
7 changes: 3 additions & 4 deletions sound/soc/sof/intel/hda.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1178,10 +1178,8 @@ static struct snd_soc_acpi_adr_device *find_acpi_adr_device(struct device *dev,

endpoints = devm_kcalloc(dev, codec_info_list[i].dai_num,
sizeof(struct snd_soc_acpi_endpoint), GFP_KERNEL);
if (!endpoints) {
dev_err(dev, "failed to allocate memory for endpoints\n");
if (!endpoints)
return NULL;
}

name_prefix = codec_info_list[i].name_prefix;
/*
Expand Down Expand Up @@ -1413,7 +1411,8 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev
* Set mach->sof_tplg_filename as a dummy topology to avoid tplg file checking
* and being used.
*/
mach->sof_tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL, "sof-%s-dummy.tplg", chip->platform);
mach->sof_tplg_filename = devm_kasprintf(sdev->dev, GFP_KERNEL,
"sof-%s-dummy.tplg", chip->platform);

dev_info(sdev->dev, "Use SoundWire default machine driver with function topologies\n");
return mach;
Expand Down
Loading