diff options
| -rw-r--r-- | baseboard/dedede/baseboard.c | 17 | ||||
| -rw-r--r-- | baseboard/dedede/baseboard.h | 1 | ||||
| -rw-r--r-- | board/waddledoo/gpio.inc | 2 |
3 files changed, 19 insertions, 1 deletions
diff --git a/baseboard/dedede/baseboard.c b/baseboard/dedede/baseboard.c index fcf8f275fc..9f6a37d3d1 100644 --- a/baseboard/dedede/baseboard.c +++ b/baseboard/dedede/baseboard.c @@ -6,6 +6,7 @@ /* Dedede family-specific configuration */ #include "adc.h" +#include "board_config.h" #include "chipset.h" #include "common.h" #include "gpio.h" @@ -21,6 +22,22 @@ const enum gpio_signal hibernate_wake_pins[] = {}; const int hibernate_wake_pins_used; +void board_after_rsmrst(int rsmrst) +{ + /* + * b:148688874: If RSMRST# is de-asserted, enable the pull-up on + * PG_PP1050_ST_OD. It won't be enabled prior to this signal going high + * because the load switch for PP1050_ST cannot pull the PG low. Once + * it's asserted, disable the pull up so we don't inidicate that the + * power is good before the rail is actually ready. + */ + int flags = rsmrst ? GPIO_PULL_UP : 0; + + flags |= GPIO_INT_BOTH; + + gpio_set_flags(GPIO_PG_PP1050_ST_OD, flags); +} + uint32_t pp3300_a_pgood; __override int intel_x86_get_pg_ec_dsw_pwrok(void) { diff --git a/baseboard/dedede/baseboard.h b/baseboard/dedede/baseboard.h index df6903193c..1494bdc79f 100644 --- a/baseboard/dedede/baseboard.h +++ b/baseboard/dedede/baseboard.h @@ -127,6 +127,7 @@ #define CONFIG_PWM /* SoC */ +#define CONFIG_BOARD_HAS_AFTER_RSMRST #define CONFIG_BOARD_HAS_RTC_RESET #define CONFIG_CHIPSET_JASPERLAKE #define CONFIG_POWER_BUTTON diff --git a/board/waddledoo/gpio.inc b/board/waddledoo/gpio.inc index 91e3f6f8eb..97fb3cf80a 100644 --- a/board/waddledoo/gpio.inc +++ b/board/waddledoo/gpio.inc @@ -22,7 +22,7 @@ GPIO_INT(VCCIN_AUX_VID0, PIN(F, 4), GPIO_INT_BOTH | GPIO_SEL_1P8V, power_signal GPIO_INT(PG_VCCIO_EXT_OD, PIN(B, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_PP5000_U_OD, PIN(E, 2), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PG_DRAM_OD, PIN(E, 4), GPIO_INT_BOTH, power_signal_interrupt) -GPIO_INT(PG_PP1050_ST_OD, PIN(4, 2), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) +GPIO_INT(PG_PP1050_ST_OD, PIN(4, 2), GPIO_INT_BOTH, power_signal_interrupt) /* USB-C interrupts */ GPIO_INT(USB_C0_INT_ODL, PIN(6, 2), GPIO_INT_FALLING | GPIO_PULL_UP, usb_c0_interrupt) |