Unverified Commit 75b31192 authored by Jianqun Xu's avatar Jianqun Xu Committed by Mark Brown
Browse files

ASoC: rockchip: add config for rockchip dmaengine pcm register 



This patch makes the rockchip i2s pcm configurable by adding
rockchip pcm config for devm_snd_dmaengine_pcm_register.

Signed-off-by: default avatarJianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a56df73b

sound/soc/rockchip/Makefile

+2 −1
Original line number Diff line number Diff line 
# 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

obj-$(CONFIG_SND_SOC_ROCKCHIP_I2S) += snd-soc-rockchip-i2s.o snd-soc-rockchip-pcm.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_PDM) += snd-soc-rockchip-pdm.o

obj-$(CONFIG_SND_SOC_ROCKCHIP_SPDIF) += snd-soc-rockchip-spdif.o

sound/soc/rockchip/rockchip_i2s.c

+2 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <sound/dmaengine_pcm.h>



#include "rockchip_i2s.h"

#include "rockchip_pcm.h"



#define DRV_NAME "rockchip-i2s"
@@ -674,7 +675,7 @@ static int rockchip_i2s_probe(struct platform_device *pdev) 
		goto err_suspend;

	}



	ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0);

	ret = rockchip_pcm_platform_register(&pdev->dev);

	if (ret) {

		dev_err(&pdev->dev, "Could not register PCM\n");

		return ret;

sound/soc/rockchip/rockchip_pcm.c

0 → 100644
+45 −0
Original line number Diff line number Diff line 
/*

 * 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,

	.period_bytes_min	= 32,

	.period_bytes_max	= 8192,

	.periods_min		= 1,

	.periods_max		= 52,

	.buffer_bytes_max	= 64 * 1024,

	.fifo_size		= 32,

};



static const struct snd_dmaengine_pcm_config rk_dmaengine_pcm_config = {

	.pcm_hardware = &snd_rockchip_hardware,

	.prealloc_buffer_size = 32 * 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");

sound/soc/rockchip/rockchip_pcm.h

0 → 100644
+14 −0
Original line number Diff line number Diff line 
/*

 * 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