summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Wu <pengw@nvidia.com>2012-12-05 16:43:55 -0800
committerWinnie Hsu <whsu@nvidia.com>2012-12-17 12:38:13 -0800
commitbe0b31a190aba37065f77fe81ee0a3fadcf33489 (patch)
tree087b3d4360f46c6a2c2cc2ff975305651cb40896
parentc1e028a7d3f2c2a5cda48a038053898458e7198c (diff)
ARM: tegra3: pm315/beaver: enable Realtek ALC5640 audio codec support
- select RT5640 ASoC support in Cardhu machine Kconfig - enable RT5640 ASoC driver in tegra3_defconfig - select RT5639 ASoC codec when selecting RT5640, othwise kernel linking will fail Bug 1190823 Change-Id: I1046c30667d4ca8276080f1b3174eccd0b25328c Signed-off-by: Bryan Wu <pengw@nvidia.com> Reviewed-on: http://git-master/r/168884 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Winnie Hsu <whsu@nvidia.com>
-rw-r--r--arch/arm/configs/tegra3_defconfig1
-rw-r--r--arch/arm/mach-tegra/Kconfig1
-rw-r--r--sound/soc/tegra/Kconfig1
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/tegra3_defconfig b/arch/arm/configs/tegra3_defconfig
index 26889bd..cda1ff1 100644
--- a/arch/arm/configs/tegra3_defconfig
+++ b/arch/arm/configs/tegra3_defconfig
@@ -356,6 +356,7 @@ CONFIG_SND_SOC=y
CONFIG_SND_SOC_TEGRA=y
CONFIG_SND_SOC_TEGRA_WM8903=y
CONFIG_SND_SOC_TEGRA_MAX98088=y
+CONFIG_SND_SOC_TEGRA_RT5640=y
CONFIG_HID_A4TECH=m
CONFIG_HID_APPLE=m
CONFIG_HID_BELKIN=m
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 617f08b..8db7606 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -179,6 +179,7 @@ config MACH_CARDHU
select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
select MACH_HAS_SND_SOC_TEGRA_TLV320AIC326X if SND_SOC
select MACH_HAS_SND_SOC_TEGRA_MAX98095 if SND_SOC
+ select MACH_HAS_SND_SOC_TEGRA_RT5640 if SND_SOC
help
Support for NVIDIA Cardhu development platform
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig
index 2a8b4f1..de8309b 100644
--- a/sound/soc/tegra/Kconfig
+++ b/sound/soc/tegra/Kconfig
@@ -200,6 +200,7 @@ config 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_RT5640
+ select SND_SOC_RT5639
select SND_SOC_SPDIF
select SND_SOC_TEGRA30_DAM if ARCH_TEGRA_3x_SOC
help