diff options
| author | Stephen Warren <swarren@nvidia.com> | 2012-05-21 16:51:19 -0400 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2012-06-11 13:48:43 -0400 |
| commit | 0336553e4a8c1fefc11aa5656cebf2ce80657322 (patch) | |
| tree | 247933cc1eb00fbad519ed160e875768d0f3cf34 /sound/soc/tegra | |
| parent | 02e35c461daf78a093012ae2eb07535939f95c16 (diff) | |
ASoC: tegra: simplify Kconfig dependencies
The Tegra ASoC machine drivers only depend on Tegra architecture support
to compile, not specific board support. Remove Kconfig dependencies on
any particular board. This is required since Kconfig options for boards
are going away given the migration to device tree.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/tegra')
| -rw-r--r-- | sound/soc/tegra/Kconfig | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index c1c8e955f4d..76dc230f2bb 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig | |||
| @@ -58,17 +58,9 @@ config SND_SOC_TEGRA_WM8753 | |||
| 58 | Say Y or M here if you want to add support for SoC audio on Tegra | 58 | Say Y or M here if you want to add support for SoC audio on Tegra |
| 59 | boards using the WM8753 codec, such as Whistler. | 59 | boards using the WM8753 codec, such as Whistler. |
| 60 | 60 | ||
| 61 | config MACH_HAS_SND_SOC_TEGRA_WM8903 | ||
| 62 | bool | ||
| 63 | help | ||
| 64 | Machines that use the SND_SOC_TEGRA_WM8903 driver should select | ||
| 65 | this config option, in order to allow the user to enable | ||
| 66 | SND_SOC_TEGRA_WM8903. | ||
| 67 | |||
| 68 | config SND_SOC_TEGRA_WM8903 | 61 | config SND_SOC_TEGRA_WM8903 |
| 69 | tristate "SoC Audio support for Tegra boards using a WM8903 codec" | 62 | tristate "SoC Audio support for Tegra boards using a WM8903 codec" |
| 70 | depends on SND_SOC_TEGRA && I2C | 63 | depends on SND_SOC_TEGRA && I2C |
| 71 | depends on MACH_HAS_SND_SOC_TEGRA_WM8903 | ||
| 72 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC | 64 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC |
| 73 | select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC | 65 | select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC |
| 74 | select SND_SOC_WM8903 | 66 | select SND_SOC_WM8903 |
| @@ -79,7 +71,7 @@ config SND_SOC_TEGRA_WM8903 | |||
| 79 | 71 | ||
| 80 | config SND_SOC_TEGRA_TRIMSLICE | 72 | config SND_SOC_TEGRA_TRIMSLICE |
| 81 | tristate "SoC Audio support for TrimSlice board" | 73 | tristate "SoC Audio support for TrimSlice board" |
| 82 | depends on SND_SOC_TEGRA && MACH_TRIMSLICE && I2C | 74 | depends on SND_SOC_TEGRA && I2C |
| 83 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC | 75 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC |
| 84 | select SND_SOC_TLV320AIC23 | 76 | select SND_SOC_TLV320AIC23 |
| 85 | help | 77 | help |