Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/soc/davinci/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -58,13 +58,12 @@ choice 
	depends on MACH_DAVINCI_DM365_EVM



config SND_DM365_AIC3X_CODEC

	bool "Audio Codec - AIC3101"

	tristate "Audio Codec - AIC3101"

	help

	  Say Y if you want to add support for AIC3101 audio codec



config SND_DM365_VOICE_CODEC

	tristate "Voice Codec - CQ93VC"

	depends on SND_DAVINCI_SOC

	select MFD_DAVINCI_VOICECODEC

	select SND_DAVINCI_SOC_VCIF

	select SND_SOC_CQ0093VC