commit f7e797b95adc36f8c1fb6af5d4fd5c63ecbfb7c1
author Fabio Estevam <fabio.estevam@nxp.com> Sat Mar 03 17:05:48 2018 -0300
committer Shawn Guo <shawnguo@kernel.org> Mon Mar 26 19:23:47 2018 +0800
tree 06f2d4dd4a9e974d7662eb3434986c9f789339d9
parent f0dc7437265d67f582c0a0cdb1c528665a8bfa32

ARM: imx_v4_v5_defconfig: Use the generic fsl-asoc-card driver

fsl-asoc-card machine driver also supports sgtl5000, so use it favor
of the imx-sgtl5000 machine driver, which will be probably be removed
in the future.

Tested on a imx25-pdk board.

Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

arch/arm/configs/imx_v4_v5_defconfig

diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 893d0a0..054591d 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -130,8 +130,9 @@
 CONFIG_SND_SOC_MX27VIS_AIC32X4=y
 CONFIG_SND_SOC_PHYCORE_AC97=y
 CONFIG_SND_SOC_EUKREA_TLV320=y
-CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_MC13783=y
+CONFIG_SND_SOC_FSL_ASOC_CARD=y
+CONFIG_SND_SOC_SGTL5000=y
 CONFIG_USB_HID=m
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y