aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2015-07-08 13:23:00 -0400
committerShawn Guo <shawnguo@kernel.org>2015-07-14 03:09:46 -0400
commit3df2a1e60e2f9fdaf964ec64adb1976bce2ce82a (patch)
tree62b11887c160b350b118732b4dbef4eee2079eea
parentff63aed1d0023c1121fc199ee9ef1e201fc2bef9 (diff)
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>
-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
150CONFIG_INPUT_EVDEV=y 150CONFIG_INPUT_EVDEV=y
151CONFIG_INPUT_EVBUG=m 151CONFIG_INPUT_EVBUG=m
152CONFIG_KEYBOARD_GPIO=y 152CONFIG_KEYBOARD_GPIO=y
153CONFIG_KEYBOARD_SNVS_PWRKEY=y
153CONFIG_KEYBOARD_IMX=y 154CONFIG_KEYBOARD_IMX=y
154CONFIG_MOUSE_PS2=m 155CONFIG_MOUSE_PS2=m
155CONFIG_MOUSE_PS2_ELANTECH=y 156CONFIG_MOUSE_PS2_ELANTECH=y
@@ -185,6 +186,7 @@ CONFIG_POWER_SUPPLY=y
185CONFIG_POWER_RESET=y 186CONFIG_POWER_RESET=y
186CONFIG_POWER_RESET_IMX=y 187CONFIG_POWER_RESET_IMX=y
187CONFIG_POWER_RESET_SYSCON=y 188CONFIG_POWER_RESET_SYSCON=y
189CONFIG_POWER_RESET_SYSCON_POWEROFF=y
188CONFIG_SENSORS_GPIO_FAN=y 190CONFIG_SENSORS_GPIO_FAN=y
189CONFIG_THERMAL=y 191CONFIG_THERMAL=y
190CONFIG_CPU_THERMAL=y 192CONFIG_CPU_THERMAL=y