ASoC: CS42L51 and WM8962 codecs depend on INPUT

Building ARM randconfig got into a situation where CONFIG_INPUT
is turned off and SND_SOC_ALL_CODECS is turned on, which failed
for two codecs trying to use the input subsystem. Some other
drivers also select one of these codecs and consequently need an
explicit dependency added.

Appending to the dependency list seems the easiest way out,
since this is not a practical limitation. If anyone really
needs to build these codecs for a kernel with no input support,
a more sophisticated solution can be implemented.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index f0e8401378873721f0e69e7fe338fe00afe29fb5..d4260d39dbde81e00fc6e46ad89448092d947ee0 100644 (file)
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -40,7 +40,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_ALC5632 if I2C
        select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC
        select SND_SOC_CS42L51 if I2C
-       select SND_SOC_CS42L52 if I2C
+       select SND_SOC_CS42L52 if I2C && INPUT
        select SND_SOC_CS42L73 if I2C
        select SND_SOC_CS4270 if I2C
        select SND_SOC_CS4271 if SND_SOC_I2C_AND_SPI
@@ -127,7 +127,7 @@ config SND_SOC_ALL_CODECS
        select SND_SOC_WM8955 if I2C
        select SND_SOC_WM8960 if I2C
        select SND_SOC_WM8961 if I2C
-       select SND_SOC_WM8962 if I2C
+       select SND_SOC_WM8962 if I2C && INPUT
        select SND_SOC_WM8971 if I2C
        select SND_SOC_WM8974 if I2C
        select SND_SOC_WM8978 if I2C
@@ -282,7 +282,7 @@ config SND_SOC_CS42L51
 
 config SND_SOC_CS42L52
        tristate "Cirrus Logic CS42L52 CODEC"
-       depends on I2C
+       depends on I2C && INPUT
 
 config SND_SOC_CS42L73
        tristate "Cirrus Logic CS42L73 CODEC"
@@ -598,7 +598,7 @@ config SND_SOC_WM8961
 
 config SND_SOC_WM8962
        tristate "Wolfson Microelectronics WM8962 CODEC"
-       depends on I2C
+       depends on I2C && INPUT
 
 config SND_SOC_WM8971
        tristate

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 338a91642471846fd424a99aa6760406a39532d6..f4069d0ef8117b1ec2164e2a23fa4f5a3578e050 100644 (file)
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -187,7 +187,7 @@ config SND_SOC_EUKREA_TLV320
 
 config SND_SOC_IMX_WM8962
        tristate "SoC Audio support for i.MX boards with wm8962"
-       depends on OF && I2C
+       depends on OF && I2C && INPUT
        select SND_SOC_WM8962
        select SND_SOC_IMX_PCM_DMA
        select SND_SOC_IMX_AUDMUX

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index f2e289180e466ef0a9d673eea33f7ab0aaca1bd3..14568bedd425d984d78b7e6fd85f2b6899897780 100644 (file)
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -204,7 +204,7 @@ config SND_SOC_SPEYSIDE
 
 config SND_SOC_TOBERMORY
        tristate "Audio support for Wolfson Tobermory"
-       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410
+       depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && INPUT
        select SND_SAMSUNG_I2S
        select SND_SOC_WM8962