summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorXinyu Chen <b03824@freescale.com>2012-02-29 11:23:28 +0800
committerXinyu Chen <b03824@freescale.com>2012-02-29 11:23:28 +0800
commit2ccf8f51146053a1434fa2afa0be126bebf4707a (patch)
tree31474a889eb6f9c062d469e9f78c028b1ab05386 /arch/arm
parent8e8b3c00f5cd6818e31496869bfebcc49b2d8e9c (diff)
ENGR00175219-5 defconfig: add wm8958 audio codec support
Update the android defconfig for wm8958 mfd and sound driver Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/imx6_android_defconfig7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/configs/imx6_android_defconfig b/arch/arm/configs/imx6_android_defconfig
index eeb90be9196d..5c695ac01cc4 100644
--- a/arch/arm/configs/imx6_android_defconfig
+++ b/arch/arm/configs/imx6_android_defconfig
@@ -1459,6 +1459,7 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_GPIO_PCA953X_IRQ is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_WM8994 is not set
# CONFIG_GPIO_ADP5588 is not set
#
@@ -1647,7 +1648,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
@@ -1671,6 +1672,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
# CONFIG_REGULATOR_MAX8649 is not set
# CONFIG_REGULATOR_MAX8660 is not set
# CONFIG_REGULATOR_MAX8952 is not set
+# CONFIG_REGULATOR_WM8994 is not set
# CONFIG_REGULATOR_LP3971 is not set
# CONFIG_REGULATOR_LP3972 is not set
# CONFIG_REGULATOR_MC34708 is not set
@@ -1952,15 +1954,18 @@ CONFIG_SND_IMX_SOC=y
CONFIG_SND_MXC_SOC_MX2=y
CONFIG_SND_MXC_SOC_SPDIF_DAI=y
CONFIG_SND_SOC_IMX_SGTL5000=y
+CONFIG_SND_SOC_IMX_WM8958=y
CONFIG_SND_SOC_IMX_CS42888=y
CONFIG_SND_SOC_IMX_SPDIF=y
CONFIG_SND_SOC_IMX_HDMI=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_WM_HUBS=y
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