From 0d1b9445f6200ead5b87af00ef1bc7f9e6d74f47 Mon Sep 17 00:00:00 2001 From: Diana Z Date: Wed, 7 Oct 2020 15:41:29 -0600 Subject: Dedede: Leave 5V on when jumping in S5 PP5000_U shouldn't be turned off until G3, so if a sysjump occurs during S5 leave this rail on. BRANCH=None BUG=b:166787955,b:167996216 TEST=on drawcia, run full resets with a forced sysjump in S5 and ensure that the DUT can get to S0 after the reset Signed-off-by: Diana Z Change-Id: I00fb44903aa109bbc525fb512ab4035a94649c68 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2458841 Reviewed-by: Aseda Aboagye Commit-Queue: Aseda Aboagye --- board/drawcia/board.c | 3 ++- board/madoo/board.c | 3 ++- board/magolor/board.c | 3 ++- board/waddledee/board.c | 3 ++- board/waddledoo/board.c | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/board/drawcia/board.c b/board/drawcia/board.c index fe9bb0e940..fd8a8e187f 100644 --- a/board/drawcia/board.c +++ b/board/drawcia/board.c @@ -407,7 +407,8 @@ void board_init(void) } /* Turn on 5V if the system is on, otherwise turn it off */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND); + on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | + CHIPSET_STATE_SOFT_OFF); board_power_5v_enable(on); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); diff --git a/board/madoo/board.c b/board/madoo/board.c index 9ced2a0ecb..b1198b28a4 100644 --- a/board/madoo/board.c +++ b/board/madoo/board.c @@ -129,7 +129,8 @@ void board_init(void) gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); /* Turn on 5V if the system is on, otherwise turn it off. */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND); + on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | + CHIPSET_STATE_SOFT_OFF); board_power_5v_enable(on); if (get_cbi_fw_config_keyboard() == CUST_UK2_KB) { /* diff --git a/board/magolor/board.c b/board/magolor/board.c index d173c25716..8f3485b121 100644 --- a/board/magolor/board.c +++ b/board/magolor/board.c @@ -166,7 +166,8 @@ void board_init(void) gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); /* Turn on 5V if the system is on, otherwise turn it off. */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND); + on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | + CHIPSET_STATE_SOFT_OFF); board_power_5v_enable(on); /* Initialize THERMAL */ diff --git a/board/waddledee/board.c b/board/waddledee/board.c index b85ce0cd97..15dc9a9bf5 100644 --- a/board/waddledee/board.c +++ b/board/waddledee/board.c @@ -264,7 +264,8 @@ void board_init(void) sm5803_configure_gpio0(CHARGER_SECONDARY, GPIO0_MODE_OUTPUT, 0); /* Turn on 5V if the system is on, otherwise turn it off */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND); + on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | + CHIPSET_STATE_SOFT_OFF); board_power_5v_enable(on); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); diff --git a/board/waddledoo/board.c b/board/waddledoo/board.c index fb5c51a0a6..1e658d65f2 100644 --- a/board/waddledoo/board.c +++ b/board/waddledoo/board.c @@ -150,7 +150,8 @@ void board_init(void) gpio_enable_interrupt(GPIO_BASE_SIXAXIS_INT_L); /* Turn on 5V if the system is on, otherwise turn it off. */ - on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND); + on = chipset_in_state(CHIPSET_STATE_ON | CHIPSET_STATE_ANY_SUSPEND | + CHIPSET_STATE_SOFT_OFF); board_power_5v_enable(on); } DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT); -- cgit v1.2.1