[RFC] Add gb-audio prerequsite components

Message ID 1429315023-31801-1-git-send-email-john.stultz@linaro.org
State New
Headers show

Commit Message

John Stultz April 17, 2015, 11:57 p.m.
Add codec/simplecard support required for gb-audio to function,
and remove the tegra audio drivers.

Change-Id: Ic35033762d7abe9919d35e2b3ff9c6b75e8afd18
Cc: Greg KH <gregkh@google.com>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 arch/arm/configs/tegra12_android_hdmi-primary_defconfig | 9 +--------
 sound/soc/generic/Kconfig                               | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

Patch

diff --git a/arch/arm/configs/tegra12_android_hdmi-primary_defconfig b/arch/arm/configs/tegra12_android_hdmi-primary_defconfig
index 09277dd..72d245c 100644
--- a/arch/arm/configs/tegra12_android_hdmi-primary_defconfig
+++ b/arch/arm/configs/tegra12_android_hdmi-primary_defconfig
@@ -415,16 +415,9 @@  CONFIG_BACKLIGHT_TEGRA_PWM=y
 CONFIG_BACKLIGHT_MAX8831=y
 CONFIG_SOUND=y
 CONFIG_SND=y
-CONFIG_SND_HDA_INTEL=y
-CONFIG_SND_HDA_PLATFORM_DRIVER=y
-CONFIG_SND_HDA_PLATFORM_NVIDIA_TEGRA=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=10
 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_SND_SOC_TEGRA_MAX98090=y
+CONFIG_SND_GB_AUDIO=y
 CONFIG_HIDRAW=y
 CONFIG_UHID=y
 CONFIG_HID_A4TECH=y
diff --git a/sound/soc/generic/Kconfig b/sound/soc/generic/Kconfig
index 610f612..52866ed 100644
--- a/sound/soc/generic/Kconfig
+++ b/sound/soc/generic/Kconfig
@@ -2,3 +2,11 @@  config SND_SIMPLE_CARD
 	tristate "ASoC Simple sound card support"
 	help
 	  This option enables generic simple sound card support
+
+config SND_GB_AUDIO
+	bool "Support for Greybus audio"
+	select SND_SIMPLE_CARD
+	select SND_SOC_SPDIF
+	select SND_SOC_RT5645
+	help
+	  This option enabled support for Greybus audio