summaryrefslogtreecommitdiffstats
path: root/sound/soc/rockchip
diff options
context:
space:
mode:
authorAndreas Ruprecht <rupran@einserver.de>2014-11-21 20:50:46 +0100
committerMark Brown <broonie@kernel.org>2014-11-24 20:01:18 +0100
commit8d213de7ffff614e3aa751a31a8980e1be3036e1 (patch)
tree54dfbc237c94e6a9ba858fb391e7512748a82d6e /sound/soc/rockchip
parentASoC: rockchip: i2s: add text after tristate for SND_SOC_ROCKCHIP_I2S (diff)
downloadlinux-8d213de7ffff614e3aa751a31a8980e1be3036e1.tar.xz
linux-8d213de7ffff614e3aa751a31a8980e1be3036e1.zip
ASoC: rockchip: i2s: Fix Kconfig for I2S device driver
Currently, CONFIG_SND_SOC_ROCKCHIP_I2S could also be selected without having CONFIG_SND_SOC_ROCKCHIP enabled. As this makes no sense, a Kconfig dependency is added to CONFIG_SND_SOC_ROCKCHIP_I2S. This will make the item visible only if CONFIG_SND_SOC_ROCKCHIP is enabled. Additionally, as the code connected to CONFIG_SND_SOC_ROCKCHIP_I2S depends on CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM, the dependency is moved to reflect this more clearly. Signed-off-by: Andreas Ruprecht <rupran@einserver.de> Reported-by: Jim Davis <jim.epost@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/rockchip')
-rw-r--r--sound/soc/rockchip/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
index b1fc0ca3e617..e18182699d83 100644
--- a/sound/soc/rockchip/Kconfig
+++ b/sound/soc/rockchip/Kconfig
@@ -1,7 +1,6 @@
config SND_SOC_ROCKCHIP
tristate "ASoC support for Rockchip"
depends on COMPILE_TEST || ARCH_ROCKCHIP
- select SND_SOC_GENERIC_DMAENGINE_PCM
help
Say Y or M if you want to add support for codecs attached to
the Rockchip SoCs' Audio interfaces. You will also need to
@@ -9,7 +8,8 @@ config SND_SOC_ROCKCHIP
config SND_SOC_ROCKCHIP_I2S
tristate "Rockchip I2S Device Driver"
- depends on CLKDEV_LOOKUP
+ depends on CLKDEV_LOOKUP && SND_SOC_ROCKCHIP
+ select SND_SOC_GENERIC_DMAENGINE_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