summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSjoerd Simons <sjoerd.simons@collabora.co.uk>2016-01-08 13:16:46 +0100
committerArnd Bergmann <arnd@arndb.de>2016-01-08 13:52:42 +0100
commit43c555ca4e7e1521ca500db7e372f67abb1378a2 (patch)
treebe270588a0b7106cd414a5c08341292ce0608b5d
parentd5e2c954d3f56388b45879d3579f43960117a1f2 (diff)
downloadlinux-stable-43c555ca4e7e1521ca500db7e372f67abb1378a2.tar.gz
linux-stable-43c555ca4e7e1521ca500db7e372f67abb1378a2.tar.bz2
linux-stable-43c555ca4e7e1521ca500db7e372f67abb1378a2.zip
ARM: multi_v7_defconfig: Add rockchip audio support
As the rockchip SPDIF driver landed for 4.4 and the required clock patches to make it work properly are scheduled for the 4.5 merge window it seems time to support for audio device found on rockchip boards in the defconfig as well. Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk> Acked-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/multi_v7_defconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 8f8700a0f9aa..0cc8408a9467 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -549,6 +549,10 @@ CONFIG_SND_SOC=m
CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_ATMEL_SOC_WM8904=m
CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
+CONFIG_SND_SOC_ROCKCHIP_MAX98090=m
+CONFIG_SND_SOC_ROCKCHIP_RT5645=m
CONFIG_SND_SOC_SH4_FSI=m
CONFIG_SND_SOC_RCAR=m
CONFIG_SND_SOC_RSRC_CARD=m
@@ -565,6 +569,7 @@ CONFIG_SND_SOC_TEGRA_ALC5632=m
CONFIG_SND_SOC_TEGRA_MAX98090=m
CONFIG_SND_SOC_AK4642=m
CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SPDIF=m
CONFIG_SND_SOC_WM8978=m
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y