aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2019-09-20 03:50:18 -0400
committerMark Brown <broonie@kernel.org>2019-09-20 07:06:48 -0400
commit147162f575152db80000fb3de26358264768ee9f (patch)
tree6ad914656093628b5b5210bd7a60a34ffcd8e6f7 /sound
parent7b2db65b59c30d58c129d3c8b2101feca686155a (diff)
ASoC: ti: fix SND_SOC_DM365_VOICE_CODEC dependencies
SND_SOC_DM365_VOICE_CODEC is a 'bool' option in a choice statement, meaning it cannot be set to =m, but it selects two other drivers that we may want to be loadable modules after all: WARNING: unmet direct dependencies detected for SND_SOC_CQ0093VC Depends on [m]: SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] Selected by [y]: - SND_SOC_DM365_VOICE_CODEC [=y] && <choice> Selected by [m]: - SND_SOC_ALL_CODECS [=m] && SOUND [=m] && !UML && SND [=m] && SND_SOC [=m] && COMPILE_TEST [=y] Add an intermediate symbol that sets SND_SOC_CQ0093VC and MFD_DAVINCI_VOICECODEC to =m if SND_SOC=m. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20190920075046.3210393-1-arnd@arndb.de Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/ti/Kconfig11
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig
index 87a9b9dd4e98..29f61053ab62 100644
--- a/sound/soc/ti/Kconfig
+++ b/sound/soc/ti/Kconfig
@@ -200,11 +200,18 @@ config SND_SOC_DM365_AIC3X_CODEC
200 200
201config SND_SOC_DM365_VOICE_CODEC 201config SND_SOC_DM365_VOICE_CODEC
202 bool "Voice Codec - CQ93VC" 202 bool "Voice Codec - CQ93VC"
203 select MFD_DAVINCI_VOICECODEC
204 select SND_SOC_CQ0093VC
205 help 203 help
206 Say Y if you want to add support for SoC On-chip voice codec 204 Say Y if you want to add support for SoC On-chip voice codec
207endchoice 205endchoice
208 206
207config SND_SOC_DM365_VOICE_CODEC_MODULE
208 def_tristate y
209 depends on SND_SOC_DM365_VOICE_CODEC && SND_SOC
210 select MFD_DAVINCI_VOICECODEC
211 select SND_SOC_CQ0093VC
212 help
213 The is an internal symbol needed to ensure that the codec
214 and MFD driver can be built as loadable modules if necessary.
215
209endmenu 216endmenu
210 217