* [PATCH] ASoC: davinci: fix DM365_EVM codec selection
@ 2015-01-28 21:30 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2015-01-28 21:30 UTC (permalink / raw)
To: broonie
Cc: Kevin Hilman, alsa-devel, Sekhar Nori, lgirdwood, linux-arm-kernel
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: Arnd Bergmann <arnd@arndb.de>
Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index 8e948c63f3d9..2b81ca418d2a 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ASoC: davinci: fix DM365_EVM codec selection
@ 2015-01-28 21:30 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2015-01-28 21:30 UTC (permalink / raw)
To: linux-arm-kernel
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: Arnd Bergmann <arnd@arndb.de>
Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
index 8e948c63f3d9..2b81ca418d2a 100644
--- a/sound/soc/davinci/Kconfig
+++ b/sound/soc/davinci/Kconfig
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ASoC: davinci: fix DM365_EVM codec selection
2015-01-28 21:30 ` Arnd Bergmann
@ 2015-01-29 11:51 ` Mark Brown
-1 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2015-01-29 11:51 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Kevin Hilman, alsa-devel, Sekhar Nori, lgirdwood, linux-arm-kernel
[-- Attachment #1.1: Type: text/plain, Size: 306 bytes --]
On Wed, Jan 28, 2015 at 10:30:01PM +0100, Arnd Bergmann wrote:
> 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.
Applied, thanks.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ASoC: davinci: fix DM365_EVM codec selection
@ 2015-01-29 11:51 ` Mark Brown
0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2015-01-29 11:51 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 28, 2015 at 10:30:01PM +0100, Arnd Bergmann wrote:
> 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.
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150129/3273ba33/attachment.sig>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-29 11:51 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-28 21:30 [PATCH] ASoC: davinci: fix DM365_EVM codec selection Arnd Bergmann
2015-01-28 21:30 ` Arnd Bergmann
2015-01-29 11:51 ` Mark Brown
2015-01-29 11:51 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.