Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next

[deliverable/linux.git] / sound / soc / tegra / Kconfig

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 19e5fe7cc403ac8e55822a52e05bc69c21d1835f..dbc27ce1d4deb32d14f8e6e40291b828d179fbf7 100644 (file)
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -6,6 +6,16 @@ config SND_SOC_TEGRA
        help
          Say Y or M here if you want support for SoC audio on Tegra.
 
+config SND_SOC_TEGRA20_AC97
+       tristate
+       depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
+       select SND_SOC_AC97_BUS
+       select SND_SOC_TEGRA20_DAS
+       help
+         Say Y or M if you want to add support for codecs attached to the
+         Tegra20 AC97 interface. You will also need to select the individual
+         machine drivers to support below.
+
 config SND_SOC_TEGRA20_DAS
        tristate
        depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
@@ -70,6 +80,15 @@ config SND_SOC_TEGRA_WM8903
          boards using the WM8093 codec. Currently, the supported boards are
          Harmony, Ventana, Seaboard, Kaen, and Aebl.
 
+config SND_SOC_TEGRA_WM9712
+       tristate "SoC Audio support for Tegra boards using a WM9712 codec"
+       depends on SND_SOC_TEGRA && ARCH_TEGRA_2x_SOC
+       select SND_SOC_TEGRA20_AC97
+       select SND_SOC_WM9712
+       help
+         Say Y or M here if you want to add support for SoC audio on Tegra
+         boards using the WM9712 (or compatible) codec.
+
 config SND_SOC_TEGRA_TRIMSLICE
        tristate "SoC Audio support for TrimSlice board"
        depends on SND_SOC_TEGRA && I2C