aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary Zhang <b13634@freescale.com>2012-02-28 14:48:26 +0800
committerBernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>2012-04-18 22:09:50 +0200
commit7c50d88167d212ac0b301af201819c287c2b3991 (patch)
treebb334150e86a79d1fc581fefc179b33a7f327e00
parentdc6b5c225863ea8044c2aa930377714c49944b9b (diff)
downloadimx6-7c50d88167d212ac0b301af201819c287c2b3991.tar.gz
ENGR00175219-1 MX6: add wm8958 option in defconfig
add wm8958 option in defconfig Signed-off-by: Gary Zhang <b13634@freescale.com>
-rw-r--r--arch/arm/configs/imx6_defconfig4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/configs/imx6_defconfig b/arch/arm/configs/imx6_defconfig
index 8f00d362cc1..de2b94cf8a1 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1432,7 +1432,7 @@ CONFIG_MFD_CORE=y
# CONFIG_MFD_WM831X_I2C is not set
# CONFIG_MFD_WM831X_SPI is not set
# CONFIG_MFD_WM8350_I2C is not set
-# CONFIG_MFD_WM8994 is not set
+CONFIG_MFD_WM8994=y
# CONFIG_MFD_PCF50633 is not set
# CONFIG_PMIC_DIALOG is not set
# CONFIG_MFD_MC_PMIC is not set
@@ -1802,12 +1802,14 @@ CONFIG_SND_SOC_IMX_SGTL5000=y
CONFIG_SND_SOC_IMX_CS42888=y
CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_IMX_HDMI=y
+CONFIG_SND_SOC_IMX_WM8958=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_MXC_HDMI=y
CONFIG_SND_SOC_MXC_SPDIF=y
CONFIG_SND_SOC_SGTL5000=y
CONFIG_SND_SOC_CS42888=y
+CONFIG_SND_SOC_WM8994=y
# CONFIG_SOUND_PRIME is not set
CONFIG_AC97_BUS=y
CONFIG_HID_SUPPORT=y