diff options
| author | Wai-Hong Tam <waihong@google.com> | 2021-08-18 14:12:01 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-18 23:02:54 +0000 |
| commit | fb89306a92228081e4203a33725357dd9754b6c8 (patch) | |
| tree | d544cd8738dbc3bcf025e28d1be48d7d5279e996 | |
| parent | 039a19e8d2393f169ae81680505bc5c9c4cd4b12 (diff) | |
| download | chrome-ec-fb89306a92228081e4203a33725357dd9754b6c8.tar.gz | |
herobrine_npcx9: Make WARM_RESET and POWER_GOOD power signals
Herobrine uses the SPI mux to separate the SPI bus from the AP when
programming the AP firmware. Overdriving signals on WARM_RESET is not
needed. Make the WARM_RESET and POWER_GOOD GPIOs like normal power
signals.
BRANCH=None
BUG=b:187098628
TEST=Booted AP properly. Flashed the AP firmware, even AP is off.
Change-Id: Ie8e42de8174bc71c29424697810e46a2367e3e54
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3105006
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | board/herobrine_npcx9/gpio.inc | 8 | ||||
| -rw-r--r-- | zephyr/projects/herobrine/herobrine_npcx9/include/gpio_map.h | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/board/herobrine_npcx9/gpio.inc b/board/herobrine_npcx9/gpio.inc index 187426e977..c6e1320250 100644 --- a/board/herobrine_npcx9/gpio.inc +++ b/board/herobrine_npcx9/gpio.inc @@ -29,12 +29,10 @@ GPIO_INT(PS_HOLD, PIN(A, 6), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_sig GPIO_INT(AP_SUSPEND, PIN(5, 7), GPIO_INT_BOTH, power_signal_interrupt) /* Suspend signal from PMIC */ /* * When switch-cap is off, the POWER_GOOD signal is floating. Need a pull-down - * to make it low. Overload the interrupt function chipset_warm_reset_interrupt - * 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. + * to make it low. */ -GPIO_INT(MB_POWER_GOOD, PIN(3, 7), GPIO_INT_BOTH | GPIO_PULL_DOWN, chipset_power_good_interrupt) /* PP1800_L18B from PMIC */ -GPIO_INT(WARM_RESET_L, PIN(B, 0), GPIO_INT_BOTH, chipset_warm_reset_interrupt) /* AP warm reset */ +GPIO_INT(MB_POWER_GOOD, PIN(3, 7), GPIO_INT_BOTH | GPIO_PULL_DOWN, power_signal_interrupt) /* PP1800_L18B from PMIC */ +GPIO_INT(WARM_RESET_L, PIN(B, 0), GPIO_INT_BOTH, power_signal_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 */ /* Sensor interrupts */ diff --git a/zephyr/projects/herobrine/herobrine_npcx9/include/gpio_map.h b/zephyr/projects/herobrine/herobrine_npcx9/include/gpio_map.h index f1a255399f..00ab9bd98c 100644 --- a/zephyr/projects/herobrine/herobrine_npcx9/include/gpio_map.h +++ b/zephyr/projects/herobrine/herobrine_npcx9/include/gpio_map.h @@ -38,11 +38,10 @@ GPIO_INT(GPIO_VOLUME_UP_L, GPIO_INT_EDGE_BOTH, button_interrupt) \ GPIO_INT(GPIO_AP_RST_L, GPIO_INT_EDGE_BOTH, chipset_ap_rst_interrupt) \ GPIO_INT(GPIO_AP_SUSPEND, GPIO_INT_EDGE_BOTH, power_signal_interrupt) \ - GPIO_INT(GPIO_POWER_GOOD, GPIO_INT_EDGE_BOTH, \ - chipset_power_good_interrupt) \ + GPIO_INT(GPIO_POWER_GOOD, GPIO_INT_EDGE_BOTH, power_signal_interrupt) \ GPIO_INT(GPIO_PS_HOLD, GPIO_INT_EDGE_BOTH, power_signal_interrupt) \ GPIO_INT(GPIO_WARM_RESET_L, GPIO_INT_EDGE_BOTH, \ - chipset_warm_reset_interrupt) \ + power_signal_interrupt) \ GPIO_INT(GPIO_USB_C0_PD_INT_ODL, GPIO_INT_EDGE_FALLING, \ tcpc_alert_event) \ GPIO_INT(GPIO_USB_C1_PD_INT_ODL, GPIO_INT_EDGE_FALLING, \ |