commit 42914fdde5bcda9f9118f20456d2c22300cda645
author Nicolin Chen <b42378@freescale.com> Thu Jun 13 19:51:04 2013 +0800
committer Shawn Guo <shawn.guo@linaro.org> Mon Jun 17 15:45:17 2013 +0800
tree 7dd917971366a9852744a71c32aff725e7517f82
parent e7eccc7e16acfcc3e613e7c0df7e62528d24581c

ARM: imx_v6_v7_defconfig: Enable imx-wm8962 by default

Enable imx-wm8962 and PM_RUNTIME, essential for WM8962 CODEC driver.

Signed-off-by: Nicolin Chen <b42378@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>

arch/arm/configs/imx_v6_v7_defconfig

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index c7eb5f6..0982048 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -48,6 +48,7 @@
 CONFIG_VFP=y
 CONFIG_NEON=y
 CONFIG_BINFMT_MISC=m
+CONFIG_PM_RUNTIME=y
 CONFIG_PM_DEBUG=y
 CONFIG_PM_TEST_SUSPEND=y
 CONFIG_NET=y
@@ -184,6 +185,7 @@
 CONFIG_SND_IMX_SOC=y
 CONFIG_SND_SOC_PHYCORE_AC97=y
 CONFIG_SND_SOC_EUKREA_TLV320=y
+CONFIG_SND_SOC_IMX_WM8962=y
 CONFIG_SND_SOC_IMX_SGTL5000=y
 CONFIG_SND_SOC_IMX_MC13783=y
 CONFIG_USB=y