Commit f9a7ba32 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Mark Brown

ASoC: davinci: fix DM365_EVM codec selection

An earlier bug fix of mine made the SND_DM365_VOICE_CODEC symbol
tristate to avoid creating an undefined reference from the
davinci-vcif.c driver to the davinci_soc_platform_register
function that may be in a module.

However, this may now lead to a different error on randconfig
kernels:

"warning: SND_DM365_VOICE_CODEC creates inconsistent choice state"

This happens because we now have a choice statement with
one bool and one tristate option, and the latter might not
support being set to 'y' because of dependencies.

This new change turns the other option into 'tristate' as well,
which avoids the problem.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: 19926c6d ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5a1b8a80
...@@ -58,13 +58,12 @@ choice ...@@ -58,13 +58,12 @@ choice
depends on MACH_DAVINCI_DM365_EVM depends on MACH_DAVINCI_DM365_EVM
config SND_DM365_AIC3X_CODEC config SND_DM365_AIC3X_CODEC
bool "Audio Codec - AIC3101" tristate "Audio Codec - AIC3101"
help help
Say Y if you want to add support for AIC3101 audio codec Say Y if you want to add support for AIC3101 audio codec
config SND_DM365_VOICE_CODEC config SND_DM365_VOICE_CODEC
tristate "Voice Codec - CQ93VC" tristate "Voice Codec - CQ93VC"
depends on SND_DAVINCI_SOC
select MFD_DAVINCI_VOICECODEC select MFD_DAVINCI_VOICECODEC
select SND_DAVINCI_SOC_VCIF select SND_DAVINCI_SOC_VCIF
select SND_SOC_CQ0093VC select SND_SOC_CQ0093VC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment