[alsa-devel] [PATCH] ASoC: rockchip: i2s: Add dependency to 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 (and breaks the build, when the option CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM - which would be selected by CONFIG_SND_SOC_ROCKCHIP - is not enabled), 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.
Signed-off-by: Andreas Ruprecht rupran@einserver.de Reported-by: Jim Davis jim.epost@gmail.com --- sound/soc/rockchip/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index b1fc0ca..74380b4 100644 --- a/sound/soc/rockchip/Kconfig +++ b/sound/soc/rockchip/Kconfig @@ -9,7 +9,7 @@ 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 help Say Y or M if you want to add support for I2S driver for Rockchip I2S device. The device supports upto maximum of
On Fri, Nov 21, 2014 at 07:35:13PM +0100, Andreas Ruprecht wrote:
Currently, CONFIG_SND_SOC_ROCKCHIP_I2S could also be selected without having CONFIG_SND_SOC_ROCKCHIP enabled.
As this makes no sense (and breaks the build, when the option CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM - which would be selected by CONFIG_SND_SOC_ROCKCHIP - is not enabled), 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.
This doesn't seem like an obvious fix - why is the fix not to put the select on the I2S driver (which is the thing that actually depends on the dmaengine stuff)?
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
On 21.11.2014 19:58, Mark Brown wrote:
On Fri, Nov 21, 2014 at 07:35:13PM +0100, Andreas Ruprecht wrote:
Currently, CONFIG_SND_SOC_ROCKCHIP_I2S could also be selected without having CONFIG_SND_SOC_ROCKCHIP enabled.
As this makes no sense (and breaks the build, when the option CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM - which would be selected by CONFIG_SND_SOC_ROCKCHIP - is not enabled), 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.
This doesn't seem like an obvious fix - why is the fix not to put the select on the I2S driver (which is the thing that actually depends on the dmaengine stuff)?
I didn't look a lot further into it, I just saw the build error report and from the other commits touching the Kconfig file it looked like there could be more options in the future.
I will submit a v2 of the patch in a minute with the select for the dmaengine support moved to the I2S option.
Regards,
Andreas
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 --- sound/soc/rockchip/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig index b1fc0ca..e181826 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
On Fri, Nov 21, 2014 at 08:50:46PM +0100, Andreas Ruprecht wrote:
Currently, CONFIG_SND_SOC_ROCKCHIP_I2S could also be selected without having CONFIG_SND_SOC_ROCKCHIP enabled.
Applied, thanks.
participants (2)
-
Andreas Ruprecht -
Mark Brown