summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGary Zhang <b13634@freescale.com>2012-02-28 14:48:26 +0800
committerGary Zhang <b13634@freescale.com>2012-02-28 14:48:26 +0800
commite58051f5edac2d636b3e0b33a5a328ec75d7349f (patch)
tree6d3c3282ad20968c1a5d3e6f18cde57e2114a0d7 /arch
parent733162e5a554243ae1f8e0f9973cfa42246bb1e1 (diff)
ENGR00175219-1 MX6: add wm8958 option in defconfig
add wm8958 option in defconfig Signed-off-by: Gary Zhang <b13634@freescale.com>
Diffstat (limited to 'arch')
-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 899533ec3998..e3e6d6867748 100644
--- a/arch/arm/configs/imx6_defconfig
+++ b/arch/arm/configs/imx6_defconfig
@@ -1433,7 +1433,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
@@ -1806,12 +1806,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