summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx_v4_v5_defconfig
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2018-03-03 17:05:48 -0300
committerShawn Guo <shawnguo@kernel.org>2018-03-26 19:23:47 +0800
commitf7e797b95adc36f8c1fb6af5d4fd5c63ecbfb7c1 (patch)
tree06f2d4dd4a9e974d7662eb3434986c9f789339d9 /arch/arm/configs/imx_v4_v5_defconfig
parentf0dc7437265d67f582c0a0cdb1c528665a8bfa32 (diff)
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>
Diffstat (limited to 'arch/arm/configs/imx_v4_v5_defconfig')
-rw-r--r--arch/arm/configs/imx_v4_v5_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index 893d0a0cefc1..054591dc9a00 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -130,8 +130,9 @@ CONFIG_SND_IMX_SOC=y
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