diff options
| -rw-r--r-- | board/trogdor/gpio.inc | 2 | ||||
| -rw-r--r-- | include/chipset.h | 10 | ||||
| -rw-r--r-- | power/sc7180.c | 29 |
3 files changed, 27 insertions, 14 deletions
diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc index ed717a99bc..6320f6ce44 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -36,7 +36,7 @@ GPIO_INT(AP_SUSPEND, PIN(5, 7), GPIO_INT_BOTH | GPIO_SEL_1P8V, power_sign * for not only signalling power_signal_interrupt but also handling the logic * of WARM_RESET_L which is pulled-up by the same rail of POWER_GOOD. */ -GPIO_INT(POWER_GOOD, PIN(5, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, chipset_warm_reset_interrupt) /* SRC_PP1800_S10A from PMIC */ +GPIO_INT(POWER_GOOD, PIN(5, 4), GPIO_INT_BOTH | GPIO_PULL_DOWN, chipset_power_good_interrupt) /* SRC_PP1800_S10A from PMIC */ GPIO_INT(WARM_RESET_L, PIN(F, 4), GPIO_INT_BOTH | GPIO_SEL_1P8V, chipset_warm_reset_interrupt) /* AP warm reset */ GPIO_INT(AP_EC_SPI_CS_L, PIN(5, 3), GPIO_INT_FALLING | GPIO_PULL_DOWN, shi_cs_event) /* EC SPI Chip Select */ diff --git a/include/chipset.h b/include/chipset.h index 7b684598cb..d69f86a340 100644 --- a/include/chipset.h +++ b/include/chipset.h @@ -202,6 +202,7 @@ static inline void chipset_handle_espi_reset_assert(void) { } static inline void chipset_handle_reboot(void) { } static inline void chipset_reset_request_interrupt(enum gpio_signal signal) { } static inline void chipset_warm_reset_interrupt(enum gpio_signal signal) { } +static inline void chipset_power_good_interrupt(enum gpio_signal signal) { } static inline void chipset_watchdog_interrupt(enum gpio_signal signal) { } #endif /* !HAS_TASK_CHIPSET */ @@ -228,11 +229,18 @@ void chipset_reset_request_interrupt(enum gpio_signal signal); /** * GPIO interrupt handler of warm reset signal from servo or H1. * - * It is used in SDM845 chipset power sequence. + * It is used in Qualcomm chipset power sequence. */ void chipset_warm_reset_interrupt(enum gpio_signal signal); /** + * GPIO interrupt handler of the power good signal (pull rail of warm reset). + * + * It is used in Qualcomm chipset power sequence. + */ +void chipset_power_good_interrupt(enum gpio_signal signal); + +/** * GPIO interrupt handler of watchdog from AP. * * It is used in MT8183 chipset, where it must be setup to trigger on falling diff --git a/power/sc7180.c b/power/sc7180.c index 7d8b5b9cb0..7788f04833 100644 --- a/power/sc7180.c +++ b/power/sc7180.c @@ -171,19 +171,8 @@ void chipset_warm_reset_interrupt(enum gpio_signal signal) GPIO_SEL_1P8V | GPIO_OUT_HIGH); gpio_set_flags(GPIO_AP_RST_L, GPIO_INT_BOTH | GPIO_SEL_1P8V | GPIO_OUT_LOW); - } else { - /* - * The pull-up rail POWER_GOOD drops. - * - * High-Z both AP_RST_L and PS_HOLD to restore their - * states. - */ - gpio_set_flags(GPIO_AP_RST_L, GPIO_INT_BOTH | - GPIO_SEL_1P8V); - gpio_set_flags(GPIO_PS_HOLD, GPIO_INT_BOTH | - GPIO_SEL_1P8V); - ap_rst_overdriven = 0; } + /* Ignore the else clause, the pull-up rail drops. */ } else { if (ap_rst_overdriven) { /* @@ -201,7 +190,23 @@ void chipset_warm_reset_interrupt(enum gpio_signal signal) } /* If not overdriven, just a normal power-up, do nothing. */ } + power_signal_interrupt(signal); +} +void chipset_power_good_interrupt(enum gpio_signal signal) +{ + if (!gpio_get_level(GPIO_POWER_GOOD) && ap_rst_overdriven) { + /* + * POWER_GOOD is the pull-up rail of WARM_RESET_L. + * When POWER_GOOD drops, high-Z both AP_RST_L and PS_HOLD + * to restore their states. + */ + gpio_set_flags(GPIO_AP_RST_L, GPIO_INT_BOTH | + GPIO_SEL_1P8V); + gpio_set_flags(GPIO_PS_HOLD, GPIO_INT_BOTH | + GPIO_SEL_1P8V); + ap_rst_overdriven = 0; + } power_signal_interrupt(signal); } |