diff mbox

[08/15] ASoC: missing codec dependencies

Message ID 1398496909-27785-9-git-send-email-kaixu.xia@linaro.org
State New
Headers show

Commit Message

Xia Kaixu April 26, 2014, 7:21 a.m. UTC 
From: Arnd Bergmann <arnd@arndb.de>

We should not just 'select' a codec that has external dependencies
if those are not met, so meet the complete dependency list.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Xia Kaixu <kaixu.xia@linaro.org>
Cc: Mark Brown <broonie@kernel.org>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Kukjin Kim <kgene.kim@samsung.com>
Cc: Sangbeom Kim <sbkim73@samsung.com>
Cc: Lars-Peter Clausen <lars@metafoo.de>
Cc: Timur Tabi <timur@tabi.org>
Cc: alsa-devel@alsa-project.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
---
 sound/soc/codecs/Kconfig  |    4 ++--
 sound/soc/fsl/Kconfig     |    2 +-
 sound/soc/samsung/Kconfig |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

Comments

Arnd Bergmann April 28, 2014, 12:21 p.m. UTC | #1 
On Saturday 26 April 2014 15:21:42 Xia Kaixu wrote:

> diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
> index d06cd81..d4260d3 100644
> --- a/sound/soc/codecs/Kconfig
> +++ b/sound/soc/codecs/Kconfig
> @@ -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 338a916..f4069d0 100644
> --- 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
> @@ -206,7 +206,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
>  

These four can probably get merged into patch 2, with an
extended description that also mentions the case where we directly
enable a codec.

Even better would be to split it again into two patches, one
for CS42L52 and one for WM8962, but each across all files.

> diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
> index 42a544a..b09b5a4 100644
> --- a/sound/soc/samsung/Kconfig
> +++ b/sound/soc/samsung/Kconfig
> @@ -130,7 +130,7 @@ config SND_SOC_SAMSUNG_SIMTEC_HERMES
>  
>  config SND_SOC_SAMSUNG_H1940_UDA1380
>  	tristate "Audio support for the HP iPAQ H1940"
> -	depends on SND_SOC_SAMSUNG && ARCH_H1940
> +	depends on SND_SOC_SAMSUNG && ARCH_H1940 && I2C
>  	select SND_S3C24XX_I2S
>  	select SND_SOC_UDA1380
>  	help
> @@ -138,7 +138,7 @@ config SND_SOC_SAMSUNG_H1940_UDA1380
>  
>  config SND_SOC_SAMSUNG_RX1950_UDA1380
>  	tristate "Audio support for the HP iPAQ RX1950"
> -	depends on SND_SOC_SAMSUNG && MACH_RX1950
> +	depends on SND_SOC_SAMSUNG && MACH_RX1950 && I2C
>  	select SND_S3C24XX_I2S
>  	select SND_SOC_UDA1380
>  	help

These should be one separate patch, which explains that
UDA1380 requires I2C support.

	Arnd
diff mbox

Patch

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index d06cd81..d4260d3 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -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 338a916..f4069d0 100644
--- 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 42a544a..b09b5a4 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -130,7 +130,7 @@  config SND_SOC_SAMSUNG_SIMTEC_HERMES
 
 config SND_SOC_SAMSUNG_H1940_UDA1380
 	tristate "Audio support for the HP iPAQ H1940"
-	depends on SND_SOC_SAMSUNG && ARCH_H1940
+	depends on SND_SOC_SAMSUNG && ARCH_H1940 && I2C
 	select SND_S3C24XX_I2S
 	select SND_SOC_UDA1380
 	help
@@ -138,7 +138,7 @@  config SND_SOC_SAMSUNG_H1940_UDA1380
 
 config SND_SOC_SAMSUNG_RX1950_UDA1380
 	tristate "Audio support for the HP iPAQ RX1950"
-	depends on SND_SOC_SAMSUNG && MACH_RX1950
+	depends on SND_SOC_SAMSUNG && MACH_RX1950 && I2C
 	select SND_S3C24XX_I2S
 	select SND_SOC_UDA1380
 	help
@@ -206,7 +206,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