Skip to content

[not upstream] ASoC: SOF: amd: fix upstream-20261015 merge for load_f… #5995

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 1 commit into from
Oct 22, 2026
Merged

[not upstream] ASoC: SOF: amd: fix upstream-20261015 merge for load_f… #5995

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sound/soc/sof/amd/acp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ int acp_get_bar_index(struct snd_sof_dev *sdev, u32 type);

/* ACP7.B/7.F ASP carveout firmware load helper functions */
int acp7x_query_asp_carveout(struct snd_sof_dev *sdev);
int acp7x_load_firmware_carveout(struct snd_sof_dev *sdev);
int acp7x_load_firmware_carveout(struct snd_sof_dev *sdev, const char *fw_name);
int acp7x_configure_carveout_pte(struct snd_sof_dev *sdev);

/* Block IO callbacks */
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/sof/amd/acp_asp_mailbox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ int acp7x_query_asp_carveout(struct snd_sof_dev *sdev)
}
EXPORT_SYMBOL_NS(acp7x_query_asp_carveout, "SND_SOC_SOF_AMD_COMMON");

int acp7x_load_firmware_carveout(struct snd_sof_dev *sdev)
int acp7x_load_firmware_carveout(struct snd_sof_dev *sdev, const char *fw_name)
{
struct snd_sof_pdata *plat_data = sdev->pdata;
struct acp_dev_data *adata = plat_data->hw_pdata;
Expand Down
Loading