diff options
| author | Mark Brown <broonie@kernel.org> | 2024-11-14 11:39:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-11-14 11:39:47 +0000 |
| commit | 07db6d5e12bbc2d698ca01113b0db62bc7b80e3f (patch) | |
| tree | e650149258728f0115a6c320e7b548dcef9d7352 /sound/soc/sof/amd | |
| parent | de35b06bf15cb56c96c7a69474e305852cc170e3 (diff) | |
| parent | 2ae6da569e34e1d26c5275442d17ffd75fd343b3 (diff) | |
ASoC: Merge up fixes
Needed for new Intel board file changes.
Diffstat (limited to 'sound/soc/sof/amd')
| -rw-r--r-- | sound/soc/sof/amd/acp.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/sound/soc/sof/amd/acp.c b/sound/soc/sof/amd/acp.c index de3001f5b9bb..95d4762c9d93 100644 --- a/sound/soc/sof/amd/acp.c +++ b/sound/soc/sof/amd/acp.c @@ -342,11 +342,19 @@ int acp_dma_status(struct acp_dev_data *adata, unsigned char ch) { struct snd_sof_dev *sdev = adata->dev; unsigned int val; + unsigned int acp_dma_ch_sts; int ret = 0; + switch (adata->pci_rev) { + case ACP70_PCI_ID: + acp_dma_ch_sts = ACP70_DMA_CH_STS; + break; + default: + acp_dma_ch_sts = ACP_DMA_CH_STS; + } val = snd_sof_dsp_read(sdev, ACP_DSP_BAR, ACP_DMA_CNTL_0 + ch * sizeof(u32)); if (val & ACP_DMA_CH_RUN) { - ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, ACP_DMA_CH_STS, val, !val, + ret = snd_sof_dsp_read_poll_timeout(sdev, ACP_DSP_BAR, acp_dma_ch_sts, val, !val, ACP_REG_POLL_INTERVAL, ACP_DMA_COMPLETE_TIMEOUT_US); if (ret < 0) |