This is a note to let you know that I've just added the patch titled
ASoC: davinci: fix DM365_EVM codec selection
to the 3.18-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
asoc-davinci-fix-dm365_evm-codec-selection.patch
and it can be found in the queue-3.18 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From f9a7ba326938f03b9305af8d31c360fce10cd4df Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <[email protected]>
Date: Wed, 28 Jan 2015 22:30:01 +0100
Subject: ASoC: davinci: fix DM365_EVM codec selection
From: Arnd Bergmann <[email protected]>
commit f9a7ba326938f03b9305af8d31c360fce10cd4df upstream.
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 <[email protected]>
Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC
is")
Signed-off-by: Mark Brown <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
sound/soc/davinci/Kconfig | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- 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
Patches currently in stable-queue which might be from [email protected] are
queue-3.18/cpufreq-s3c-remove-last-use-of-resume_clocks-callback.patch
queue-3.18/arm-vexpress-use-arm_cpu_suspend-if-needed.patch
queue-3.18/timberdale-do-not-select-timb_dma.patch
queue-3.18/cpufreq-s3c-remove-incorrect-__init-annotations.patch
queue-3.18/arm-mvebu-build-armada375-smp-code-conditionally.patch
queue-3.18/usb-musb-add-omap-control-dependency.patch
queue-3.18/asoc-davinci-fix-dm365_evm-codec-selection.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
