summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--board/herobrine_npcx9/gpio.inc8
-rw-r--r--zephyr/projects/herobrine/herobrine_npcx9/include/gpio_map.h5
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, \