ASoC: tegra: Kconfig and Makefile

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 821ab0b759bb6ef869314f166bed3e28ae43882d..8224db5f0434ffa7c16b93899f06401ae7c9ed3b 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -55,6 +55,7 @@ source "sound/soc/pxa/Kconfig"
 source "sound/soc/samsung/Kconfig"
 source "sound/soc/s6000/Kconfig"
 source "sound/soc/sh/Kconfig"
+source "sound/soc/tegra/Kconfig"
 source "sound/soc/txx9/Kconfig"
 
 # Supported codecs

diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index df83d2143afbf86d4baf50ca3ae3e26f821a12e0..1ed61c5df2c583f655d5dedb1c4041f840c8cae1 100644 (file)
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -18,4 +18,5 @@ obj-$(CONFIG_SND_SOC) += pxa/
 obj-$(CONFIG_SND_SOC)  += samsung/
 obj-$(CONFIG_SND_SOC)  += s6000/
 obj-$(CONFIG_SND_SOC)  += sh/
+obj-$(CONFIG_SND_SOC)  += tegra/
 obj-$(CONFIG_SND_SOC)  += txx9/

diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
new file mode 100644 (file)
index 0000000..5514f1c
--- /dev/null
+++ b/sound/soc/tegra/Kconfig
@@ -0,0 +1,27 @@
+config SND_TEGRA_SOC
+       tristate "SoC Audio for the Tegra System-on-Chip"
+       depends on ARCH_TEGRA && TEGRA_SYSTEM_DMA
+       default m
+       help
+         Say Y or M here if you want support for SoC audio on Tegra.
+
+config SND_TEGRA_SOC_I2S
+       tristate
+       depends on SND_TEGRA_SOC
+       depends on !TEGRA_I2S_AUDIO
+       default m
+       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_TEGRA_SOC_HARMONY
+       tristate "SoC Audio support for Tegra Harmony reference board"
+       depends on SND_TEGRA_SOC && MACH_HARMONY && I2C
+       default m
+       select SND_TEGRA_SOC_I2S
+       select SND_SOC_WM8903
+       help
+         Say Y or M here if you want to add support for SoC audio on the
+         Tegra Harmony reference board.
+

diff --git a/sound/soc/tegra/Makefile b/sound/soc/tegra/Makefile
new file mode 100644 (file)
index 0000000..dfd2ab9
--- /dev/null
+++ b/sound/soc/tegra/Makefile
@@ -0,0 +1,14 @@
+# Tegra platform Support
+snd-soc-tegra-das-objs := tegra_das.o
+snd-soc-tegra-pcm-objs := tegra_pcm.o
+snd-soc-tegra-i2s-objs := tegra_i2s.o
+
+obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-das.o
+obj-$(CONFIG_SND_TEGRA_SOC) += snd-soc-tegra-pcm.o
+obj-$(CONFIG_SND_TEGRA_SOC_I2S) += snd-soc-tegra-i2s.o
+
+# Tegra machine Support
+snd-soc-tegra-harmony-objs := harmony.o
+snd-soc-tegra-harmony-objs += tegra_asoc_utils.o
+
+obj-$(CONFIG_SND_TEGRA_SOC_HARMONY) += snd-soc-tegra-harmony.o