diff mbox

[09/15] ASoC: add more dependencies

Message ID 1398496909-27785-10-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>

The missing dependency can lead to build errors, so we should 
get 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: Paul Parsons <lost.distance@yahoo.com>
Cc: Eric Miao <eric.y.miao@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Philipp Zabel <philipp.zabel@gmail.com>
Cc: alsa-devel@alsa-project.org
Cc: linux-arm-kernel@lists.infradead.org
---
 sound/soc/pxa/Kconfig |    2 +-
 sound/soc/sh/Kconfig  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Arnd Bergmann April 28, 2014, 12:25 p.m. UTC | #1 
On Saturday 26 April 2014 15:21:43 Xia Kaixu wrote:
> diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
> index 6473052..672dd22 100644
> --- a/sound/soc/pxa/Kconfig
> +++ b/sound/soc/pxa/Kconfig
> @@ -140,7 +140,7 @@ config SND_PXA910_SOC
>  
>  config SND_SOC_TTC_DKB
>         bool "SoC Audio support for TTC DKB"
> -       depends on SND_PXA910_SOC && MACH_TTC_DKB
> +       depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y && MMP_SRAM
>         select PXA_SSP
>         select SND_PXA_SOC_SSP
>         select SND_MMP_SOC

I'm no longer sure if this one is the right solution, for now just
keep the dependency on I2C, but drop the part about MMP_SRAM.

We should probably get back to that later, after the series
is merged.

> diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
> index ff60e11..b43fdf0 100644
> --- a/sound/soc/sh/Kconfig
> +++ b/sound/soc/sh/Kconfig
> @@ -56,7 +56,7 @@ config SND_SH7760_AC97
>  
>  config SND_SIU_MIGOR
>         tristate "SIU sound support on Migo-R"
> -       depends on SH_MIGOR
> +       depends on SH_MIGOR && I2C
>         select SND_SOC_SH4_SIU
>         select SND_SOC_WM8978
>         help

This should be a separate patch, and mention that WM8978 needs I2C
support in the description.

	Arnd
diff mbox

Patch

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 6473052..672dd22 100644
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -140,7 +140,7 @@  config SND_PXA910_SOC
 
 config SND_SOC_TTC_DKB
 	bool "SoC Audio support for TTC DKB"
-	depends on SND_PXA910_SOC && MACH_TTC_DKB
+	depends on SND_PXA910_SOC && MACH_TTC_DKB && I2C=y && MMP_SRAM
 	select PXA_SSP
 	select SND_PXA_SOC_SSP
 	select SND_MMP_SOC
diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index ff60e11..b43fdf0 100644
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -56,7 +56,7 @@  config SND_SH7760_AC97
 
 config SND_SIU_MIGOR
 	tristate "SIU sound support on Migo-R"
-	depends on SH_MIGOR
+	depends on SH_MIGOR && I2C
 	select SND_SOC_SH4_SIU
 	select SND_SOC_WM8978
 	help