From 2aec56ed7e3f00f29703067ac620ec2bc5f58c9e Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Tue, 6 Jul 2021 21:15:13 +0800 Subject: [PATCH] ASoC: rockchip: Make rockchip_pcm depends on SND_SOC_ROCKCHIP This patch make rockchip_pcm.c compiled depends on SND_SOC_ROCKCHIP, because all the dai of rockchip will switch to use it, and we can do much more customize, such as minimize the prealloc buffer size. Change-Id: Ia7a3923db6760273d2291b41c194f28b43de83b2 Signed-off-by: Sugar Zhang --- sound/soc/rockchip/Kconfig | 7 ++++++- sound/soc/rockchip/Makefile | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index d610b553ea3b..7d580a7bb767 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -10,12 +10,17 @@ config SND_SOC_ROCKCHIP config SND_SOC_ROCKCHIP_I2S tristate "Rockchip I2S Device Driver" depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP - select SND_SOC_GENERIC_DMAENGINE_PCM + select SND_SOC_ROCKCHIP_PCM help Say Y or M if you want to add support for I2S driver for Rockchip I2S device. The device supports upto maximum of 8 channels each for play and record. +config SND_SOC_ROCKCHIP_PCM + tristate + depends on SND_SOC_ROCKCHIP + select SND_SOC_GENERIC_DMAENGINE_PCM + config SND_SOC_ROCKCHIP_PDM tristate "Rockchip PDM Controller Driver" depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP diff --git a/sound/soc/rockchip/Makefile b/sound/soc/rockchip/Makefile index 65e814d46006..03631fd6b805 100644 --- a/sound/soc/rockchip/Makefile +++ b/sound/soc/rockchip/Makefile @@ -5,7 +5,8 @@ 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_PCM) += 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