diff options
author | Frank Li <Frank.Li@freescale.com> | 2015-07-08 13:23:00 -0400 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2015-07-14 03:09:46 -0400 |
commit | 3df2a1e60e2f9fdaf964ec64adb1976bce2ce82a (patch) | |
tree | 62b11887c160b350b118732b4dbef4eee2079eea | |
parent | ff63aed1d0023c1121fc199ee9ef1e201fc2bef9 (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_defconfig | 2 |
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 | |||
150 | CONFIG_INPUT_EVDEV=y | 150 | CONFIG_INPUT_EVDEV=y |
151 | CONFIG_INPUT_EVBUG=m | 151 | CONFIG_INPUT_EVBUG=m |
152 | CONFIG_KEYBOARD_GPIO=y | 152 | CONFIG_KEYBOARD_GPIO=y |
153 | CONFIG_KEYBOARD_SNVS_PWRKEY=y | ||
153 | CONFIG_KEYBOARD_IMX=y | 154 | CONFIG_KEYBOARD_IMX=y |
154 | CONFIG_MOUSE_PS2=m | 155 | CONFIG_MOUSE_PS2=m |
155 | CONFIG_MOUSE_PS2_ELANTECH=y | 156 | CONFIG_MOUSE_PS2_ELANTECH=y |
@@ -185,6 +186,7 @@ CONFIG_POWER_SUPPLY=y | |||
185 | CONFIG_POWER_RESET=y | 186 | CONFIG_POWER_RESET=y |
186 | CONFIG_POWER_RESET_IMX=y | 187 | CONFIG_POWER_RESET_IMX=y |
187 | CONFIG_POWER_RESET_SYSCON=y | 188 | CONFIG_POWER_RESET_SYSCON=y |
189 | CONFIG_POWER_RESET_SYSCON_POWEROFF=y | ||
188 | CONFIG_SENSORS_GPIO_FAN=y | 190 | CONFIG_SENSORS_GPIO_FAN=y |
189 | CONFIG_THERMAL=y | 191 | CONFIG_THERMAL=y |
190 | CONFIG_CPU_THERMAL=y | 192 | CONFIG_CPU_THERMAL=y |