aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@nxp.com>2018-03-01 16:08:56 -0300
committerShawn Guo <shawnguo@kernel.org>2018-03-08 16:26:03 +0800
commit78ca8450a4d7d95775a50257f031fb85a8fe2bb2 (patch)
tree316f7ca7b0b81ba6b2d9868d6a7550cf22942dff /arch/arm/configs/imx_v6_v7_defconfig
parentARM: imx_v6_v7_defconfig: Re-sync defconfig (diff)
downloadlinux-dev-78ca8450a4d7d95775a50257f031fb85a8fe2bb2.tar.xz
linux-dev-78ca8450a4d7d95775a50257f031fb85a8fe2bb2.zip
ARM: imx_v6_v7_defconfig: Select CONFIG_SND_SOC_WM8962 explicitly
Currently CONFIG_SND_SOC_WM8962 is selected via SND_SOC_IMX_WM8962 machine driver option. SND_SOC_IMX_WM8962 will be removed in the next kernel cycle, so select the codec driver directly so that it can still be used by default via the generic fsl-asoc-card machine driver. Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Acked-by: Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 9d9c7296c192..3a308437b088 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -284,6 +284,7 @@ CONFIG_SND_SOC_AC97_CODEC=y
CONFIG_SND_SOC_CS42XX8_I2C=y
CONFIG_SND_SOC_TLV320AIC3X=y
CONFIG_SND_SOC_WM8960=y
+CONFIG_SND_SOC_WM8962=y
CONFIG_SND_SIMPLE_CARD=y
CONFIG_HID_MULTITOUCH=y
CONFIG_USB=y