Applied "ASoC: rockchip: add config for rockchip dmaengine pcm register" to the asoc tree
Subsystems (3)
Mark Brown
maintainerThe patch
ASoC: rockchip: add config for rockchip dmaengine pcm register
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
75b31192fe6ad20b42276b20ee3bdf1493216d63Mon Sep 17 00:00:00 2001
From: Jianqun Xu <[email protected]>
Date: Fri, 8 Jun 2018 16:31:09 +0800
Subject: [PATCH] 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.
--- sound/soc/rockchip/Makefile | 3 ++- sound/soc/rockchip/rockchip_i2s.c | 3 ++- sound/soc/rockchip/rockchip_pcm.c | 45 +++++++++++++++++++++++++++++++ sound/soc/rockchip/rockchip_pcm.h | 14 ++++++++++ 4 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 sound/soc/rockchip/rockchip_pcm.c create mode 100644 sound/soc/rockchip/rockchip_pcm.h
sound/soc/rockchip/Makefile +2 -1
@@ -1,10 +1,11 @@ # 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
@@ -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 new file +45 -0
45 lines not on this page · raw message
sound/soc/rockchip/rockchip_pcm.h new file +14 -0
@@ -0,0 +1,14 @@ +/* +* 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
Signature · 1 line
2.17.1