3.19-stable patches

added patches:
	asoc-davinci-fix-dm365_evm-codec-selection.patch

diff --git a/queue-3.19/asoc-davinci-fix-dm365_evm-codec-selection.patch b/queue-3.19/asoc-davinci-fix-dm365_evm-codec-selection.patch
new file mode 100644 (file)
index 0000000..44abda8
--- /dev/null
+++ b/queue-3.19/asoc-davinci-fix-dm365_evm-codec-selection.patch
@@ -0,0 +1,52 @@
+From f9a7ba326938f03b9305af8d31c360fce10cd4df Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Wed, 28 Jan 2015 22:30:01 +0100
+Subject: ASoC: davinci: fix DM365_EVM codec selection
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+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 <arnd@arndb.de>
+Fixes: 19926c6de0c3 ("ASoC: davinci: vcif must be a module if SND_DAVINCI_SOC is")
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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

diff --git a/queue-3.19/series b/queue-3.19/series
index 46bfd3c1e769850914ca0d079eb8c7b50c7c3127..423a1c67a507e7e0bfed95173b949f98e8e68885 100644 (file)
--- a/queue-3.19/series
+++ b/queue-3.19/series
@@ -26,3 +26,4 @@ asoc-rt5670-set-use_single_rw-flag-for-regmap.patch
 asoc-intel-sst-fix-firmware-name-size-handling.patch
 asoc-rt5677-fix-spi-dependency.patch
 asoc-mioa701_wm9713-fix-speaker-event.patch
+asoc-davinci-fix-dm365_evm-codec-selection.patch