diff options
| author | Mark Brown <broonie@kernel.org> | 2021-08-06 01:46:24 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-08-06 01:46:24 +0100 |
| commit | ddaa1ed52c5da64fe9adf1d5ea6202cda3a53eea (patch) | |
| tree | 119c5b9dcf67841af4a92f3d3a9b5e4efcc4557b /sound/soc/amd/renoir | |
| parent | 585fb31c2c3aad38a5add009171d7e3277b76d45 (diff) | |
| parent | e2f6867299ac85ce227eee18be11ce2c4a568447 (diff) | |
Merge some cs42l42 patches into asoc-5.15
Diffstat (limited to 'sound/soc/amd/renoir')
| -rw-r--r-- | sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 | ||||
| -rw-r--r-- | sound/soc/amd/renoir/rn-pci-acp3x.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/amd/renoir/acp3x-pdm-dma.c b/sound/soc/amd/renoir/acp3x-pdm-dma.c index 9988a50a81b0..9dd22a2fa2e5 100644 --- a/sound/soc/amd/renoir/acp3x-pdm-dma.c +++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c @@ -242,7 +242,7 @@ static int acp_pdm_dma_hw_params(struct snd_soc_component *component, return -EINVAL; size = params_buffer_bytes(params); period_bytes = params_period_bytes(params); - rtd->dma_addr = substream->dma_buffer.addr; + rtd->dma_addr = substream->runtime->dma_addr; rtd->num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT); config_acp_dma(rtd, substream->stream); init_pdm_ring_buffer(MEM_WINDOW_START, size, period_bytes, diff --git a/sound/soc/amd/renoir/rn-pci-acp3x.c b/sound/soc/amd/renoir/rn-pci-acp3x.c index 19438da5dfa5..7b8040e812a1 100644 --- a/sound/soc/amd/renoir/rn-pci-acp3x.c +++ b/sound/soc/amd/renoir/rn-pci-acp3x.c @@ -382,6 +382,8 @@ static const struct dev_pm_ops rn_acp_pm = { .runtime_resume = snd_rn_acp_resume, .suspend = snd_rn_acp_suspend, .resume = snd_rn_acp_resume, + .restore = snd_rn_acp_resume, + .poweroff = snd_rn_acp_suspend, }; static void snd_rn_acp_remove(struct pci_dev *pci) |