summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorRobin Gong <b38343@freescale.com>2015-10-13 17:40:54 +0800
committerNitin Garg <nitin.garg@nxp.com>2016-01-14 11:01:53 -0600
commita50dd2d9e8573aa6635bff6419558b7a110427fd (patch)
tree1fa2ee7a2bf9de5bd5e2e17729bed392b84d65cf /arch/arm/configs
parent60a182f789457ac764a37a0b8d5aa09b5c0823ea (diff)
MLK-11703-9: ARM: dts: imx_v7_defconfig: add battery driver
add battery driver in imx_v7_defconfig Signed-off-by: Robin Gong <b38343@freescale.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/imx_v7_defconfig4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig
index 83f2d2874f0a..2352afefa226 100644
--- a/arch/arm/configs/imx_v7_defconfig
+++ b/arch/arm/configs/imx_v7_defconfig
@@ -150,7 +150,6 @@ CONFIG_BRCMFMAC=m
CONFIG_INPUT_EVDEV=y
CONFIG_INPUT_EVBUG=m
CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_SNVS_PWRKEY=y
CONFIG_KEYBOARD_IMX=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ELANTECH=y
@@ -175,7 +174,6 @@ CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_FSL_LPUART=y
CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
CONFIG_FSL_OTP=y
-CONFIG_IMX_SEMA4=y
# CONFIG_I2C_COMPAT is not set
CONFIG_I2C_CHARDEV=y
# CONFIG_I2C_HELPER_AUTO is not set
@@ -190,6 +188,7 @@ CONFIG_GPIO_MAX732X=y
CONFIG_GPIO_PCA953X=y
CONFIG_GPIO_74X164=y
CONFIG_POWER_SUPPLY=y
+CONFIG_SABRESD_MAX8903=y
CONFIG_SENSORS_MAX17135=y
CONFIG_SENSORS_MAG3110=y
CONFIG_THERMAL=y
@@ -319,7 +318,6 @@ CONFIG_MMC_SDHCI=y
CONFIG_MMC_SDHCI_PLTFM=y
CONFIG_MMC_SDHCI_ESDHC_IMX=y
CONFIG_MXC_IPU=y
-CONFIG_MXC_MLB150=m
CONFIG_MXC_IPU_V3_PRE=y
CONFIG_MXC_GPU_VIV=y
CONFIG_MXC_SIM=y