From 34fa0064cea91089d8f969c7d4dee8ddd311f1ac Mon Sep 17 00:00:00 2001 From: Duncan Laurie Date: Thu, 15 Dec 2016 20:54:31 -0800 Subject: [PATCH] eve: Ignore VCC1_RST status bit when determining reset cause The EC on Eve has VCC1_RST connected to 3.3DSW which drops when resetting for recovery. Since I need this to work on current boards treat Eve the same as Wheatley and use the workaround that always reports reset-pin instead of power-on status. BUG=chrome-os-partner:61028 BRANCH=none TEST=successfully enter recovery mode on eve with the keyboard Change-Id: Ica583d9a95d78689ee1b21ccfa882fced2a414d9 Signed-off-by: Duncan Laurie Reviewed-on: https://chromium-review.googlesource.com/421128 Reviewed-by: Shawn N --- chip/npcx/system.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/chip/npcx/system.c b/chip/npcx/system.c index 2d11217f5b..a0c0a749f0 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -169,7 +169,8 @@ void system_check_reset_cause(void) /* Use scratch bit to check power on reset or VCC1_RST reset */ if (!IS_BIT_SET(NPCX_RSTCTL, NPCX_RSTCTL_VCC1_RST_SCRATCH)) { -#ifdef BOARD_WHEATLEY +#if defined(BOARD_WHEATLEY) || defined(BOARD_EVE) + /* TODO(crosbug.com/p/61028): Remove workaround for Eve */ flags |= RESET_FLAG_RESET_PIN; #else /* Check for VCC1 reset */