diff options
| author | Mark Brown <broonie@kernel.org> | 2023-07-09 23:43:21 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-07-09 23:43:21 +0200 |
| commit | 3d74f42c56db263e82ad96f8fe23aef38cdc071f (patch) | |
| tree | dd8ce5f730928bf7bfea78136ba8baa341d6c62b /sound/soc/sof | |
| parent | Linux 6.5-rc1 (diff) | |
| parent | ASoC/soundwire/qdsp6/wcd: fix leaks and probe deferral (diff) | |
| download | linux-3d74f42c56db263e82ad96f8fe23aef38cdc071f.tar.xz linux-3d74f42c56db263e82ad96f8fe23aef38cdc071f.zip | |
Merge existing fixes from asoc/for-6.5 into new branch
Diffstat (limited to 'sound/soc/sof')
| -rw-r--r-- | sound/soc/sof/amd/acp.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index 2ae76bcd3590..afb505461ea1 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -217,6 +217,7 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, unsigned int image_length) { struct snd_sof_dev *sdev = adata->dev; + const struct sof_amd_acp_desc *desc = get_chip_info(sdev->pdata); unsigned int tx_count, fw_qualifier, val; int ret; @@ -251,9 +252,12 @@ int configure_and_run_sha_dma(struct acp_dev_data *adata, void *image_addr, return ret; } - ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); - if (ret) - return ret; + /* psp_send_cmd only required for renoir platform (rev - 3) */ + if (desc->rev == 3) { + ret = psp_send_cmd(adata, MBOX_ACP_SHA_DMA_COMMAND); + if (ret) + return ret; + } ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_SHA_DSP_FW_QUALIFIER, fw_qualifier, fw_qualifier & DSP_FW_RUN_ENABLE, |