diff mbox

[2/2] ARM: imx_v6_v7_defconfig: enable powerkey and syscon power off

Message ID 1436376180-5891-2-git-send-email-Frank.Li@freescale.com
State New
Headers show

Commit Message

Frank Li July 8, 2015, 5:23 p.m. UTC
From: Frank Li <Frank.Li@freescale.com>

build in snvs powerkey
build in syscon power off support

Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
 arch/arm/configs/imx_v6_v7_defconfig | 2 ++
 1 file changed, 2 insertions(+)

Comments

Shawn Guo July 14, 2015, 6:43 a.m. UTC | #1
On Thu, Jul 09, 2015 at 01:23:00AM +0800, Frank.Li@freescale.com wrote:
> From: Frank Li <Frank.Li@freescale.com>
> 
> build in snvs powerkey
> build in syscon power off support
> 
> Signed-off-by: Frank Li <Frank.Li@freescale.com>

Applied, thanks.
diff mbox

Patch

diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 4458554..5303eda 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -151,6 +151,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
@@ -186,6 +187,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