ARM: Tegra: select MACH_HAS_SND_SOC_TEGRA_WM8903

CONFIG_SND_SOC_TEGRA_WM8903 is useful for many Tegra boards. To avoid the
ASoC tegra/Kconfig enumerating them all, instead have the Tegra machine
Kconfig select MACH_HAS_SND_SOC_TEGRA_WM8903 where appropriate, and have
SND_SOC_TEGRA_WM8903 depend on this.

[Redid ASoC diff so it applies. -- broonie]

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Olof Johansson <olof@lixom.net>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 3cdeffc97b4452f7e1abb34c34b02f40f25cbadf..5ec1846aa1d0d13c17b143cd72235919b8bc5f26 100644 (file)
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -27,12 +27,14 @@ comment "Tegra board type"
 
 config MACH_HARMONY
        bool "Harmony board"
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for nVidia Harmony development platform
 
 config MACH_KAEN
        bool "Kaen board"
        select MACH_SEABOARD
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for the Kaen version of Seaboard
 
@@ -43,6 +45,7 @@ config MACH_PAZ00
 
 config MACH_SEABOARD
        bool "Seaboard board"
+       select MACH_HAS_SND_SOC_TEGRA_WM8903
        help
          Support for nVidia Seaboard development platform. It will
         also be included for some of the derivative boards that

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 66b504f06c23ce6178cb236cfeeac5938764727e..0f103a101e3cd4ecc8f6fa9a28f81f1ade669b85 100644 (file)
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -14,6 +14,13 @@ config SND_TEGRA_SOC_I2S
          Tegra I2S interface. You will also need to select the individual
          machine drivers to support below.
 
+config MACH_HAS_SND_SOC_TEGRA_WM8903
+       bool
+       help
+         Machines that use the SND_SOC_TEGRA_WM8903 driver should select
+         this config option, in order to allow the user to enable
+         SND_SOC_TEGRA_WM8903.
+
 config SND_TEGRA_SOC_HARMONY
        tristate "SoC Audio support for Tegra Harmony reference board"
        depends on SND_TEGRA_SOC && MACH_HARMONY && I2C