Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Stephen Warren and committed by
Mark Brown
cdc04fd1 4fb0384f

+22
+18
sound/soc/tegra/Kconfig
··· 30 30 You will also need to select the individual machine drivers to support 31 31 below. 32 32 33 + config SND_SOC_TEGRA30_AHUB 34 + tristate 35 + depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC 36 + help 37 + Say Y or M if you want to add support for the Tegra20 AHUB module. 38 + You will also need to select the individual machine drivers to 39 + support below. 40 + 41 + config SND_SOC_TEGRA30_I2S 42 + tristate 43 + depends on SND_SOC_TEGRA && ARCH_TEGRA_3x_SOC 44 + select SND_SOC_TEGRA30_AHUB 45 + help 46 + Say Y or M if you want to add support for codecs attached to the 47 + Tegra30 I2S interface. You will also need to select the individual 48 + machine drivers to support below. 49 + 33 50 config MACH_HAS_SND_SOC_TEGRA_WM8903 34 51 bool 35 52 help ··· 59 42 depends on SND_SOC_TEGRA && I2C 60 43 depends on MACH_HAS_SND_SOC_TEGRA_WM8903 61 44 select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC 45 + select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC 62 46 select SND_SOC_WM8903 63 47 help 64 48 Say Y or M here if you want to add support for SoC audio on Tegra
+4
sound/soc/tegra/Makefile
··· 4 4 snd-soc-tegra20-das-objs := tegra20_das.o 5 5 snd-soc-tegra20-i2s-objs := tegra20_i2s.o 6 6 snd-soc-tegra20-spdif-objs := tegra20_spdif.o 7 + snd-soc-tegra30-ahub-objs := tegra30_ahub.o 8 + snd-soc-tegra30-i2s-objs := tegra30_i2s.o 7 9 8 10 obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o 9 11 obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o 10 12 obj-$(CONFIG_SND_SOC_TEGRA20_DAS) += snd-soc-tegra20-das.o 11 13 obj-$(CONFIG_SND_SOC_TEGRA20_I2S) += snd-soc-tegra20-i2s.o 12 14 obj-$(CONFIG_SND_SOC_TEGRA20_SPDIF) += snd-soc-tegra20-spdif.o 15 + obj-$(CONFIG_SND_SOC_TEGRA30_AHUB) += snd-soc-tegra30-ahub.o 16 + obj-$(CONFIG_SND_SOC_TEGRA30_I2S) += snd-soc-tegra30-i2s.o 13 17 14 18 # Tegra machine Support 15 19 snd-soc-tegra-wm8903-objs := tegra_wm8903.o