diff options
| author | Sugar Zhang <sugar.zhang@rock-chips.com> | 2021-09-28 09:35:57 +0800 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-20 11:12:42 +0100 |
| commit | 5ba8ecf2272d34de9cd2271a0ac12f5f615ef7aa (patch) | |
| tree | c35da3b54598600df695c56bbdce79c59b2ba8ba /sound/soc/rockchip/Makefile | |
| parent | 4ca239f33737198827c7f4ac68a1f6fc8a9d79ba (diff) | |
| download | linux-stable-5ba8ecf2272d34de9cd2271a0ac12f5f615ef7aa.tar.gz linux-stable-5ba8ecf2272d34de9cd2271a0ac12f5f615ef7aa.tar.bz2 linux-stable-5ba8ecf2272d34de9cd2271a0ac12f5f615ef7aa.zip | |
ASoC: rockchip: Use generic dmaengine code
This reverts commit 75b31192fe6ad20b42276b20ee3bdf1493216d63.
The original purpose of customized pcm was to config prealloc buffer size
flexibly. but, we can do the same thing by soc-generic-dmaengine-pcm.
And the generic one can generated the better config by querying DMA
capabilities from dmaengine driver rather than the Hard-Coded one.
e.g.
the customized one:
static const struct snd_pcm_hardware snd_rockchip_hardware = {
.info = SNDRV_PCM_INFO_MMAP |
SNDRV_PCM_INFO_MMAP_VALID |
SNDRV_PCM_INFO_PAUSE |
SNDRV_PCM_INFO_RESUME |
SNDRV_PCM_INFO_INTERLEAVED,
...
the generic one:
ret = dma_get_slave_caps(chan, &dma_caps);
if (ret == 0) {
if (dma_caps.cmd_pause && dma_caps.cmd_resume)
hw.info |= SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME;
if (dma_caps.residue_granularity <= DMA_RESIDUE_GRANULARITY_SEGMENT)
hw.info |= SNDRV_PCM_INFO_BATCH;
...
So, let's revert back to use the generic dmaengine pcm.
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Reviewed-by: John Keeping <john@metanate.com>
Link: https://lore.kernel.org/r/1632792957-80428-1-git-send-email-sugar.zhang@rock-chips.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/rockchip/Makefile')
| -rw-r--r-- | sound/soc/rockchip/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile index 65e814d46006..05b078e7b87f 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -1,11 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 # ROCKCHIP Platform Support snd-soc-rockchip-i2s-objs := rockchip_i2s.o -snd-soc-rockchip-pcm-objs := rockchip_pcm.o snd-soc-rockchip-pdm-objs := rockchip_pdm.o snd-soc-rockchip-spdif-objs := rockchip_spdif.o -obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o snd-soc-rockchip-pcm.o +obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o |