mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FROMGIT: ASoC: rockchip: Use generic dmaengine code

Browse Source 
This reverts commit 75b31192fe.

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.

Change-Id: I30eee2e8047b69d7311fd6da0cfd2b5872b81e17
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>
(cherry picked from commit 5ba8ecf227
 git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.16)
This commit is contained in:
Sugar Zhang
2021-09-27 08:56:27 +08:00
committed by Tao Huang
parent ba2cfd68f4
commit d5a8a6f035
9 changed files with 6 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/rockchip/Makefile
View File

@@ -3,7 +3,6 @@
snd-soc-rockchip-audio-pwm-objs := rockchip_audio_pwm.o
snd-soc-rockchip-i2s-objs := rockchip_i2s.o
snd-soc-rockchip-i2s-tdm-objs := rockchip_i2s_tdm.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
snd-soc-rockchip-vad-objs := rockchip_vad.o
@@ -14,7 +13,6 @@ snd-soc-rockchip-vad-$(CONFIG_ARM64) += vad_preprocess_arm64.o
snd-soc-rockchip-vad-$(CONFIG_ARM) += vad_preprocess_arm.o
endif
obj-$(CONFIG_SND_SOC_ROCKCHIP) += snd-soc-rockchip-pcm.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_AUDIO_PWM) += snd-soc-rockchip-audio-pwm.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o
obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S_TDM) += snd-soc-rockchip-i2s-tdm.o

3
sound/soc/rockchip/rockchip_audio_pwm.c
View File

@@ -17,7 +17,6 @@
#include <sound/pcm_params.h>
#include "rockchip_audio_pwm.h"
#include "rockchip_pcm.h"
#define AUDIO_PWM_DMA_BURST_SIZE (16) /* size * width: 16*4 = 64 bytes */
@@ -325,7 +324,7 @@ static int rockchip_audio_pwm_probe(struct platform_device *pdev)
goto err_suspend;
}
ret = rockchip_pcm_platform_register(&pdev->dev);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "could not register pcm: %d\n", ret);
goto err_suspend;

3
sound/soc/rockchip/rockchip_i2s.c
View File

@@ -25,7 +25,6 @@
#include <sound/dmaengine_pcm.h>
#include "rockchip_i2s.h"
#include "rockchip_pcm.h"
#define DRV_NAME "rockchip-i2s"
@@ -904,7 +903,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev)
if (of_property_read_bool(node, "rockchip,no-dmaengine"))
return ret;
ret = rockchip_pcm_platform_register(&pdev->dev);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
goto err_suspend;

3
sound/soc/rockchip/rockchip_i2s_tdm.c
View File

@@ -27,7 +27,6 @@
#include <sound/dmaengine_pcm.h>
#include "rockchip_i2s_tdm.h"
#include "rockchip_pcm.h"
#define DRV_NAME "rockchip-i2s-tdm"
@@ -1889,7 +1888,7 @@ static int rockchip_i2s_tdm_probe(struct platform_device *pdev)
if (of_property_read_bool(node, "rockchip,no-dmaengine"))
return ret;
ret = rockchip_pcm_platform_register(&pdev->dev);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
return ret;

47
sound/soc/rockchip/rockchip_pcm.c
View File

@@ -1,47 +0,0 @@
/*
* Copyright (c) 2018 Rockchip Electronics Co. Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/device.h>
#include <linux/init.h>
#include <linux/module.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/soc.h>
#include <sound/dmaengine_pcm.h>
#include "rockchip_pcm.h"
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,
.period_bytes_min = 32,
.period_bytes_max = SIZE_MAX,
.periods_min = 2,
.periods_max = 4096,
.buffer_bytes_max = SIZE_MAX,
.fifo_size = 32,
};
static const struct snd_dmaengine_pcm_config rk_dmaengine_pcm_config = {
.pcm_hardware = &snd_rockchip_hardware,
.prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config,
.prealloc_buffer_size = CONFIG_SND_SOC_ROCKCHIP_PREALLOC_BUFFER_SIZE * 1024,
};
int rockchip_pcm_platform_register(struct device *dev)
{
return devm_snd_dmaengine_pcm_register(dev, &rk_dmaengine_pcm_config,
SND_DMAENGINE_PCM_FLAG_COMPAT);
}
EXPORT_SYMBOL_GPL(rockchip_pcm_platform_register);
MODULE_LICENSE("GPL v2");

14
sound/soc/rockchip/rockchip_pcm.h
View File

@@ -1,14 +0,0 @@
/*
* Copyright (c) 2018 Rockchip Electronics Co. Ltd.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#ifndef _ROCKCHIP_PCM_H
#define _ROCKCHIP_PCM_H
int rockchip_pcm_platform_register(struct device *dev);
#endif

3
sound/soc/rockchip/rockchip_pdm.c
View File

@@ -26,7 +26,6 @@
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
#include "rockchip_pcm.h"
#include "rockchip_pdm.h"
#define PDM_DMA_BURST_SIZE (8) /* size * width: 8*4 = 32 bytes */
@@ -811,7 +810,7 @@ static int rockchip_pdm_probe(struct platform_device *pdev)
if (of_property_read_bool(node, "rockchip,no-dmaengine"))
return 0;
ret = rockchip_pcm_platform_register(&pdev->dev);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "could not register pcm: %d\n", ret);
goto err_suspend;

3
sound/soc/rockchip/rockchip_spdif.c
View File

@@ -22,7 +22,6 @@
#include <sound/pcm_params.h>
#include <sound/dmaengine_pcm.h>
#include "rockchip_pcm.h"
#include "rockchip_spdif.h"
enum rk_spdif_type {
@@ -353,7 +352,7 @@ static int rk_spdif_probe(struct platform_device *pdev)
goto err_pm_suspend;
}
ret = rockchip_pcm_platform_register(&pdev->dev);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
goto err_pm_suspend;

3
sound/soc/rockchip/rockchip_spdifrx.c
View File

@@ -17,7 +17,6 @@
#include <sound/pcm_params.h>
#include <sound/dmaengine_pcm.h>
#include "rockchip_pcm.h"
#include "rockchip_spdifrx.h"
struct rk_spdifrx_dev {
@@ -336,7 +335,7 @@ static int rk_spdifrx_probe(struct platform_device *pdev)
goto err_pm_suspend;
}
ret = rockchip_pcm_platform_register(&pdev->dev);
ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);
if (ret) {
dev_err(&pdev->dev, "Could not register PCM\n");
goto err_pm_suspend;