diff options
author | Devin Lu <Devin.Lu@quantatw.com> | 2022-10-20 19:13:19 +0800 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-10-28 09:36:20 +0000 |
commit | 4fced381a22d1e7b5a6276cd95a3152ac86084bb (patch) | |
tree | ffd99462c9dd0d6c96410c1f96d27a5fe349c4ea /board | |
parent | 4a3adb811a0e335eabc103f1a2749f05c2794925 (diff) | |
download | chrome-ec-4fced381a22d1e7b5a6276cd95a3152ac86084bb.tar.gz |
vell: Change SEQ_EC_ALL_SYS_PG signal
Change GPIO_SEQ_EC_ALL_SYS_PG from GPIOD7 to GPIO97 for Board ID 6,
Keep original path for GPIOD7 with Board ID 5.
BUG=b:253957352
BRANCH=none
TEST=On re-work Vell. System boots.
Shorting the SEQ_EC_ALL_SYS_PG to ground is able to see the system
shutting down.
Signed-off-by: Devin Lu <Devin.Lu@quantatw.com>
Change-Id: I44a0c58efad532f0a09c3d16ed20788c7d5895ea
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3967917
Tested-by: Devin Lu <devin.lu@quantatw.com>
Commit-Queue: Devin Lu <devin.lu@quantatw.com>
Reviewed-by: caveh jalali <caveh@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/vell/board.c | 18 | ||||
-rw-r--r-- | board/vell/board.h | 1 | ||||
-rw-r--r-- | board/vell/gpio.inc | 4 |
3 files changed, 21 insertions, 2 deletions
diff --git a/board/vell/board.c b/board/vell/board.c index 7496df1b86..57b74e1033 100644 --- a/board/vell/board.c +++ b/board/vell/board.c @@ -20,6 +20,7 @@ #include "panic.h" #include "power_button.h" #include "power.h" +#include "power/intel_x86.h" #include "registers.h" #include "switch.h" #include "throttle_ap.h" @@ -46,3 +47,20 @@ static void board_chipset_shutdown(void) gpio_set_level(GPIO_EC_KB_BL_EN, 0); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); + +static void set_board_id_5_gpios(void) +{ + if (get_board_id() < 6) { + power_signal_list[X86_ALL_SYS_PGOOD].gpio = + GPIO_ID_5_SEQ_EC_ALL_SYS_PG; + } +} +DECLARE_HOOK(HOOK_INIT, set_board_id_5_gpios, HOOK_PRIO_FIRST); + +__override int intel_x86_get_pg_ec_all_sys_pwrgd(void) +{ + if (get_board_id() < 6) + return gpio_get_level(GPIO_ID_5_SEQ_EC_ALL_SYS_PG); + + return gpio_get_level(GPIO_PG_EC_ALL_SYS_PWRGD); +} diff --git a/board/vell/board.h b/board/vell/board.h index a17be43a50..4b3d527901 100644 --- a/board/vell/board.h +++ b/board/vell/board.h @@ -182,6 +182,7 @@ */ #define CONFIG_ADC_CHANNELS_RUNTIME_CONFIG +#define CONFIG_POWER_SIGNAL_RUNTIME_CONFIG #ifndef __ASSEMBLER__ diff --git a/board/vell/gpio.inc b/board/vell/gpio.inc index 9f6ce7cc7e..0bd8065ab4 100644 --- a/board/vell/gpio.inc +++ b/board/vell/gpio.inc @@ -14,7 +14,7 @@ GPIO_INT(EC_PROCHOT_IN_L, PIN(F, 0), GPIO_INT_BOTH, throttle_ap_p GPIO_INT(EC_WP_ODL, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt) GPIO_INT(GSC_EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH | GPIO_HIB_WAKE_LOW, power_button_interrupt) GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) -GPIO_INT(SEQ_EC_ALL_SYS_PG, PIN(D, 7), GPIO_INT_BOTH, power_signal_interrupt) +GPIO_INT(SEQ_EC_ALL_SYS_PG, PIN(9, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(SEQ_EC_DSW_PWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(SEQ_EC_RSMRST_ODL, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(SLP_S3_L, PIN(A, 5), GPIO_INT_BOTH, power_signal_interrupt) @@ -72,6 +72,7 @@ GPIO(EN_PP5000_FAN, PIN(6, 1), GPIO_OUT_HIGH) GPIO(EN_S5_RAILS, PIN(B, 6), GPIO_OUT_LOW) GPIO(IMVP9_VRRDY_OD, PIN(4, 3), GPIO_INPUT) GPIO(PCH_PWROK, PIN(7, 2), GPIO_OUT_LOW) +GPIO(ID_5_SEQ_EC_ALL_SYS_PG, PIN(D, 7), GPIO_INPUT) GPIO(SYS_RST_ODL, PIN(C, 5), GPIO_ODR_HIGH) GPIO(USB_C0_C1_TCPC_RST_ODL, PIN(A, 7), GPIO_ODR_LOW) GPIO(USB_C2_C3_TCPC_RST_ODL, PIN(9, 6), GPIO_ODR_LOW) @@ -127,7 +128,6 @@ UNUSED(PIN(5, 7)) /* GPIO57/SER_IRQ/ESPI_ALERT_L */ UNUSED(PIN(F, 4)) /* GPIOF4/I2C5_SDA1 */ UNUSED(PIN(F, 5)) /* GPIOF5/I2C5_SCL1 */ UNUSED(PIN(8, 6)) /* GPO86/TXD/CR_SOUT2 */ -UNUSED(PIN(9, 7)) /* GPIO97 */ /* Pre-configured PSL balls: J8 K6 */ |