ARM: tegra12: Update audio config
Scott Peterson [Wed, 16 Oct 2013 00:00:06 +0000 (17:00 -0700)]
Update the kernel config to add the
rt5639 and rt5640 codecs.

Change-Id: Id3ce337e4803db605e28211a52d4c8d042e9d353
Signed-off-by: Scott Peterson <speterson@nvidia.com>
Reviewed-on: http://git-master/r/299698
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>

arch/arm/configs/tegra12_android_defconfig
arch/arm/configs/tegra12_defconfig
sound/soc/tegra/Kconfig

index 67e2342..f75ba13 100644 (file)
@@ -384,6 +384,7 @@ CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_TEGRA=y
 CONFIG_SND_SOC_TEGRA_RT5639=y
+CONFIG_SND_SOC_TEGRA_RT5640=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
index 954b358..9a6901f 100644 (file)
@@ -369,6 +369,7 @@ CONFIG_SND_USB_AUDIO=y
 CONFIG_SND_SOC=y
 CONFIG_SND_SOC_TEGRA=y
 CONFIG_SND_SOC_TEGRA_RT5639=y
+CONFIG_SND_SOC_TEGRA_RT5640=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
 CONFIG_HID_ACRUX=y
index fc442a1..c4d521f 100644 (file)
@@ -256,6 +256,7 @@ config MACH_HAS_SND_SOC_TEGRA_RT5639
 config SND_SOC_TEGRA_RT5639
        tristate "SoC Audio support for Tegra boards using a ALC5639 codec"
        depends on SND_SOC_TEGRA && I2C && TEGRA_DC
+       depends on SND_SOC_TEGRA_RT5640
        select SND_SOC_TEGRA30_I2S if !ARCH_TEGRA_2x_SOC
        select SND_SOC_TEGRA30_SPDIF if !ARCH_TEGRA_2x_SOC
        select SND_SOC_RT5639