ASoC: tegra: add Kconfig and Makefile support for Tegra30

This adds Kconfig options for the Tegra30 AHUB and I2S controller, and
updates the Tegra+WM8903 machine driver Kconfig to select those.

Includes a squashed bugfix from Sumit Bhattacharya <sumitb@nvidia.com>

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 556cac29ea1566cc7d014e6f1370dc9867fcdc9d..441c317252f93e3e8ecca0b51395fb4b6add5257 100644 (file)
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -30,6 +30,23 @@ config SND_SOC_TEGRA20_SPDIF
          You will also need to select the individual machine drivers to support
          below.
 
+config SND_SOC_TEGRA30_AHUB
+       tristate
+       depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC
+       help
+         Say Y or M if you want to add support for the Tegra20 AHUB module.
+         You will also need to select the individual machine drivers to
+         support below.
+
+config SND_SOC_TEGRA30_I2S
+       tristate
+       depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC
+       select SND_SOC_TEGRA30_AHUB
+       help
+         Say Y or M if you want to add support for codecs attached to the
+         Tegra30 I2S interface. You will also need to select the individual
+         machine drivers to support below.
+
 config MACH_HAS_SND_SOC_TEGRA_WM8903
        bool
        help
@@ -42,6 +59,7 @@ config SND_SOC_TEGRA_WM8903
        depends on SND_SOC_TEGRA && I2C
        depends on MACH_HAS_SND_SOC_TEGRA_WM8903
        select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC
+       select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC
        select SND_SOC_WM8903
        help
          Say Y or M here if you want to add support for SoC audio on Tegra

diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
index 4726b909664d019c3fe8d545a6427267d32cae98..98704b48b62af2ab09be50e55911025015250294 100644 (file)
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -4,12 +4,16 @@ snd-soc-tegra-utils-objs += tegra_asoc_utils.o
 snd-soc-tegra20-das-objs := tegra20_das.o
 snd-soc-tegra20-i2s-objs := tegra20_i2s.o
 snd-soc-tegra20-spdif-objs := tegra20_spdif.o
+snd-soc-tegra30-ahub-objs := tegra30_ahub.o
+snd-soc-tegra30-i2s-objs := tegra30_i2s.o
 
 obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o
 obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o
 obj-$(CONFIG_SND_SOC_TEGRA20_DAS) += snd-soc-tegra20-das.o
 obj-$(CONFIG_SND_SOC_TEGRA20_I2S) += snd-soc-tegra20-i2s.o
 obj-$(CONFIG_SND_SOC_TEGRA20_SPDIF) += snd-soc-tegra20-spdif.o
+obj-$(CONFIG_SND_SOC_TEGRA30_AHUB) += snd-soc-tegra30-ahub.o
+obj-$(CONFIG_SND_SOC_TEGRA30_I2S) += snd-soc-tegra30-i2s.o
 
 # Tegra machine Support
 snd-soc-tegra-wm8903-objs := tegra_wm8903.o