summaryrefslogtreecommitdiff
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorNicolin Chen <b42378@freescale.com>2013-06-13 15:51:04 +0400
committerShawn Guo <shawn.guo@linaro.org>2013-06-17 11:45:17 +0400
commit42914fdde5bcda9f9118f20456d2c22300cda645 (patch)
tree7dd917971366a9852744a71c32aff725e7517f82 /arch/arm/configs/imx_v6_v7_defconfig
parente7eccc7e16acfcc3e613e7c0df7e62528d24581c (diff)
downloadlinux-42914fdde5bcda9f9118f20456d2c22300cda645.tar.xz
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>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index c7eb5f61f9bf..0982048d23dc 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -48,6 +48,7 @@ CONFIG_CMDLINE="noinitrd console=ttymxc0,115200"
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_SOC=y
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