diff options
author | Dara Ramesh <dramesh@nvidia.com> | 2012-10-10 15:44:55 +0530 |
---|---|---|
committer | Simone Willett <swillett@nvidia.com> | 2012-10-25 12:21:25 -0700 |
commit | b959c27d1bf37551f32ea32d2eddc39c318f46ff (patch) | |
tree | 1544f5a6353e54c50f61d8006af4dc98a6143215 /sound | |
parent | ad550b3f628762dd9c022c5c7ae0be8d21f1a327 (diff) |
asoc: tegra: Support BT_SCO
Add support for bt sco on dalmore platform.
Bug 1054221
Change-Id: I4acc4dd908b087a56b406bab18c4b7fc50b39425
Signed-off-by: Dara Ramesh <dramesh@nvidia.com>
Reviewed-on: http://git-master/r/143191
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/146961
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/tegra/Kconfig | 39 | ||||
-rw-r--r-- | sound/soc/tegra/tegra_rt5640.c | 4 |
2 files changed, 20 insertions, 23 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index fc65a5b10659..ecf89a0127f5 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -67,7 +67,7 @@ config SND_SOC_TEGRA_WM8903 select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC select SND_SOC_TEGRA20_SPDIF if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_WM8903 select SND_SOC_SPDIF select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC @@ -98,10 +98,10 @@ config SND_SOC_TEGRA_P1852 tristate "SoC Audio support for P1852 SKUs" depends on SND_SOC_TEGRA depends on MACH_P1852 - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_SPDIF - select SND_SOC_TEGRA30_DAM if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC help Say Y or M here if you want to add support for SoC audio on the TEGRA P1852 SKUs. These are plug-n-play boards and and the codecs @@ -120,9 +120,9 @@ config SND_SOC_TEGRA_WM8753 depends on SND_SOC_TEGRA && I2C && TEGRA_DC depends on MACH_HAS_SND_SOC_TEGRA_WM8753 select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC select SND_SOC_TEGRA20_SPDIF if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_WM8753 select SND_SOC_SPDIF help @@ -142,11 +142,11 @@ config SND_SOC_TEGRA_MAX98088 depends on SND_SOC_TEGRA && I2C && TEGRA_DC depends on MACH_HAS_SND_SOC_TEGRA_MAX98088 select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_MAX98088 select SND_SOC_SPDIF - select SND_SOC_TEGRA30_DAM if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC help Say Y or M here if you want to add support for SoC audio on Tegra boards using the MAX98088 codec. Currently, only supported board is @@ -164,11 +164,11 @@ config SND_SOC_TEGRA_TLV320AIC326X depends on SND_SOC_TEGRA && I2C && TEGRA_DC depends on MACH_HAS_SND_SOC_TEGRA_TLV320AIC326X select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_TLV320AIC326X select SND_SOC_SPDIF - select SND_SOC_TEGRA30_DAM if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC help Say Y or M here if you want to add support for SoC audio on Tegra boards using the TI AIC326X codec. @@ -185,11 +185,11 @@ config SND_SOC_TEGRA_RT5639 depends on SND_SOC_TEGRA && I2C && TEGRA_DC depends on MACH_HAS_SND_SOC_TEGRA_RT5639 depends on SND_SOC_TEGRA_RT5640 - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_RT5639 select SND_SOC_SPDIF - select SND_SOC_TEGRA30_DAM if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC help Say Y or M here if you want to add support for SoC audio on Tegra boards using the ALC5639 codec. Currently, the supported board @@ -207,7 +207,7 @@ config SND_SOC_TEGRA_RT5640 depends on SND_SOC_TEGRA && I2C && TEGRA_DC depends on MACH_HAS_SND_SOC_TEGRA_RT5640 select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_RT5640 select SND_SOC_SPDIF select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC @@ -228,11 +228,11 @@ config SND_SOC_TEGRA_MAX98095 depends on SND_SOC_TEGRA && I2C && TEGRA_DC depends on MACH_HAS_SND_SOC_TEGRA_MAX98095 select SND_SOC_TEGRA20_I2S if ARCH_TEGRA_2x_SOC - select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC - select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC select SND_SOC_MAX98095 select SND_SOC_SPDIF - select SND_SOC_TEGRA30_DAM if ARCH_TEGRA_3x_SOC + select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC help Say Y or M here if you want to add support for SoC audio on Tegra boards using the MAX98095 codec. Currently, only supported board is @@ -252,6 +252,7 @@ config SND_SOC_TEGRA_CS42L73 select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC select SND_SOC_CS42L73 select SND_SOC_TEGRA30_DAM if !ARCH_TEGRA_2x_SOC + select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC help Say Y or M here if you want to add support for SoC audio on Tegra boards using the CS42L73 codec. Currently, only supported board is diff --git a/sound/soc/tegra/tegra_rt5640.c b/sound/soc/tegra/tegra_rt5640.c index 79e4141efceb..525b28bac04b 100644 --- a/sound/soc/tegra/tegra_rt5640.c +++ b/sound/soc/tegra/tegra_rt5640.c @@ -690,11 +690,7 @@ static struct snd_soc_card snd_soc_tegra_rt5640 = { .name = "tegra-rt5640", .owner = THIS_MODULE, .dai_link = tegra_rt5640_dai, -#if defined(CONFIG_ARCH_TEGRA_11x_SOC) - .num_links = 1, -#else .num_links = ARRAY_SIZE(tegra_rt5640_dai), -#endif .resume_pre = tegra_rt5640_resume_pre, .set_bias_level = tegra_rt5640_set_bias_level, .set_bias_level_post = tegra_rt5640_set_bias_level_post, |