summaryrefslogtreecommitdiff
path: root/sound/soc/tegra
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2011-07-26 16:22:34 -0600
committerDan Willemsen <dwillemsen@nvidia.com>2011-11-30 21:43:20 -0800
commit72dbf4392aea4ea7e22a94a48057a0134cbafbb5 (patch)
tree19ef8cc67170a6e58030a3179b0114620e8ce369 /sound/soc/tegra
parentcf6f1e3adb4963609b98bdcea297409170dc0fdf (diff)
ASoC: Tegra: Add Kconfig and Makefile support for Tegra30
Signed-off-by: Stephen Warren <swarren@nvidia.com> Rebase-Id: R6c7ea5a4557593b11ab3cbe2da76ba74b19c8efc
Diffstat (limited to 'sound/soc/tegra')
-rw-r--r--sound/soc/tegra/Kconfig14
-rw-r--r--sound/soc/tegra/Makefile10
2 files changed, 21 insertions, 3 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 9f740d793556..0da660601c1e 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -18,6 +18,19 @@ config SND_SOC_TEGRA20_I2S
Tegra I2S interface. You will also need to select the individual
machine drivers to support below.
+config SND_SOC_TEGRA30_AHUB
+ tristate "Tegra 30 Audio Hub driver"
+ depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC
+
+config SND_SOC_TEGRA30_I2S
+ tristate "Tegra 30 I2S driver"
+ depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC
+ select SND_SOC_TEGRA20_AHUB
+ help
+ Say Y or M if you want to add support for codecs attached to the
+ Tegra I2S interface. You will also need to select the individual
+ machine drivers to support below.
+
config SND_SOC_TEGRA_SPDIF
tristate
depends on SND_SOC_TEGRA
@@ -39,6 +52,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 8e1f883fe71c..fafef4f8384e 100644
--- a/sound/soc/tegra/Makefile
+++ b/sound/soc/tegra/Makefile
@@ -1,14 +1,18 @@
# Tegra platform Support
-snd-soc-tegra20-das-objs := tegra20_das.o
snd-soc-tegra-pcm-objs := tegra_pcm.o
-snd-soc-tegra20-i2s-objs := tegra20_i2s.o
snd-soc-tegra-spdif-objs := tegra_spdif.o
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-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_TEGRA) += snd-soc-tegra-pcm.o
obj-$(CONFIG_SND_SOC_TEGRA20_I2S) += snd-soc-tegra20-i2s.o
+obj-$(CONFIG_SND_SOC_TEGRA30_AHUB) += snd-soc-tegra30-ahub.o
+obj-$(CONFIG_SND_SOC_TEGRA30_I2S) += snd-soc-tegra30-i2s.o
obj-$(CONFIG_SND_SOC_TEGRA_SPDIF) += snd-soc-tegra-spdif.o
# Tegra machine Support