diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-04-10 18:32:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-13 06:29:23 -0400 |
commit | cdc04fd1e982e91936cbcf3dec59a576517d67a1 (patch) | |
tree | b87934cfe2e10f5902f38bd36bc58c0796e8b673 /sound/soc | |
parent | 4fb0384f3dc68da10cf3f134c45efc6ab14f71df (diff) |
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>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/tegra/Kconfig | 18 | ||||
-rw-r--r-- | sound/soc/tegra/Makefile | 4 |
2 files changed, 22 insertions, 0 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 556cac29ea1..441c317252f 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig | |||
@@ -30,6 +30,23 @@ config SND_SOC_TEGRA20_SPDIF | |||
30 | You will also need to select the individual machine drivers to support | 30 | You will also need to select the individual machine drivers to support |
31 | below. | 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 | config MACH_HAS_SND_SOC_TEGRA_WM8903 | 50 | config MACH_HAS_SND_SOC_TEGRA_WM8903 |
34 | bool | 51 | bool |
35 | help | 52 | help |
@@ -42,6 +59,7 @@ config SND_SOC_TEGRA_WM8903 | |||
42 | depends on SND_SOC_TEGRA && I2C | 59 | depends on SND_SOC_TEGRA && I2C |
43 | depends on MACH_HAS_SND_SOC_TEGRA_WM8903 | 60 | depends on MACH_HAS_SND_SOC_TEGRA_WM8903 |
44 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC | 61 | select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC |
62 | select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC | ||
45 | select SND_SOC_WM8903 | 63 | select SND_SOC_WM8903 |
46 | help | 64 | help |
47 | Say Y or M here if you want to add support for SoC audio on Tegra | 65 | 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 4726b909664..98704b48b62 100644 --- a/sound/soc/tegra/Makefile +++ b/sound/soc/tegra/Makefile | |||
@@ -4,12 +4,16 @@ snd-soc-tegra-utils-objs += tegra_asoc_utils.o | |||
4 | snd-soc-tegra20-das-objs := tegra20_das.o | 4 | snd-soc-tegra20-das-objs := tegra20_das.o |
5 | snd-soc-tegra20-i2s-objs := tegra20_i2s.o | 5 | snd-soc-tegra20-i2s-objs := tegra20_i2s.o |
6 | snd-soc-tegra20-spdif-objs := tegra20_spdif.o | 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 | obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o | 10 | obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-pcm.o |
9 | obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o | 11 | obj-$(CONFIG_SND_SOC_TEGRA) += snd-soc-tegra-utils.o |
10 | obj-$(CONFIG_SND_SOC_TEGRA20_DAS) += snd-soc-tegra20-das.o | 12 | obj-$(CONFIG_SND_SOC_TEGRA20_DAS) += snd-soc-tegra20-das.o |
11 | obj-$(CONFIG_SND_SOC_TEGRA20_I2S) += snd-soc-tegra20-i2s.o | 13 | obj-$(CONFIG_SND_SOC_TEGRA20_I2S) += snd-soc-tegra20-i2s.o |
12 | obj-$(CONFIG_SND_SOC_TEGRA20_SPDIF) += snd-soc-tegra20-spdif.o | 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 | # Tegra machine Support | 18 | # Tegra machine Support |
15 | snd-soc-tegra-wm8903-objs := tegra_wm8903.o | 19 | snd-soc-tegra-wm8903-objs := tegra_wm8903.o |