summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2015-07-08 19:23:00 +0200
committerShawn Guo <shawnguo@kernel.org>2015-07-14 09:09:46 +0200
commit3df2a1e60e2f9fdaf964ec64adb1976bce2ce82a (patch)
tree62b11887c160b350b118732b4dbef4eee2079eea /arch/arm/configs
parentARM: imx_v6_v7_defconfig: Select HCIUART_H4 (diff)
downloadlinux-3df2a1e60e2f9fdaf964ec64adb1976bce2ce82a.tar.xz
linux-3df2a1e60e2f9fdaf964ec64adb1976bce2ce82a.zip
ARM: imx_v6_v7_defconfig: enable powerkey and syscon power off
build in snvs powerkey build in syscon power off support Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/configs')
-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 2c0a75a25e37..c7e10d430343 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -150,6 +150,7 @@ CONFIG_WLCORE_SDIO=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
@@ -185,6 +186,7 @@ CONFIG_POWER_SUPPLY=y
CONFIG_POWER_RESET=y
CONFIG_POWER_RESET_IMX=y
CONFIG_POWER_RESET_SYSCON=y
+CONFIG_POWER_RESET_SYSCON_POWEROFF=y
CONFIG_SENSORS_GPIO_FAN=y
CONFIG_THERMAL=y
CONFIG_CPU_THERMAL=y