summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--board/atlas/board.c21
-rw-r--r--board/coral/board.c20
-rw-r--r--board/elm/board.c5
-rw-r--r--board/eve/board.c21
-rw-r--r--board/fizz/board.c8
-rw-r--r--board/glkrvp/chg_usb_pd.c18
-rw-r--r--board/kukui/board.c5
-rw-r--r--board/nami/board.c21
-rw-r--r--board/nocturne/board.c18
-rw-r--r--board/rainier/board.c5
-rw-r--r--board/reef/board.c20
-rw-r--r--board/reef_mchp/board.c20
-rw-r--r--board/rowan/board.c5
-rw-r--r--board/scarlet/board.c5
-rw-r--r--board/zoombini/board.c23
15 files changed, 122 insertions, 93 deletions
diff --git a/board/atlas/board.c b/board/atlas/board.c
index 5725e1f14e..cafef7dcc0 100644
--- a/board/atlas/board.c
+++ b/board/atlas/board.c
@@ -51,17 +51,20 @@
static void tcpc_alert_event(enum gpio_signal signal)
{
- if ((signal == GPIO_USB_C0_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C0_PD_RST_L))
- return;
- else if ((signal == GPIO_USB_C1_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C1_PD_RST_L))
+ int port = -1;
+
+ switch (signal) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
return;
+ }
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(port);
}
#include "gpio_list.h"
diff --git a/board/coral/board.c b/board/coral/board.c
index bc37b92d13..eae31aa123 100644
--- a/board/coral/board.c
+++ b/board/coral/board.c
@@ -68,18 +68,20 @@ static int sku_id;
static void tcpc_alert_event(enum gpio_signal signal)
{
- if ((signal == GPIO_USB_C0_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C0_PD_RST_L))
- return;
+ int port = -1;
- if ((signal == GPIO_USB_C1_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C1_PD_RST_ODL))
+ switch (signal) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
return;
+ }
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(port);
}
#ifdef CONFIG_USB_PD_TCPC_LOW_POWER
diff --git a/board/elm/board.c b/board/elm/board.c
index 0e08f0d6da..35f47f20ce 100644
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -57,10 +57,7 @@
void pd_mcu_interrupt(enum gpio_signal signal)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with PD MCU to determine interrupt cause */
- host_command_pd_send_status(0);
-#endif
+ schedule_deferred_pd_interrupt(0 /* port */);
}
void deferred_reset_pd_mcu(void);
diff --git a/board/eve/board.c b/board/eve/board.c
index 18ba0e4d27..0979169845 100644
--- a/board/eve/board.c
+++ b/board/eve/board.c
@@ -62,17 +62,20 @@
static void tcpc_alert_event(enum gpio_signal signal)
{
- if ((signal == GPIO_USB_C0_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C0_PD_RST_L))
- return;
- else if ((signal == GPIO_USB_C1_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C1_PD_RST_L))
+ int port = -1;
+
+ switch (signal) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
return;
+ }
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(port);
}
/*
diff --git a/board/fizz/board.c b/board/fizz/board.c
index d2e46d913a..7e31b5575e 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -60,13 +60,7 @@ static uint8_t sku;
static void tcpc_alert_event(enum gpio_signal signal)
{
- if (!gpio_get_level(GPIO_USB_C0_PD_RST_ODL))
- return;
-
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(0 /* port */);
}
#define ADP_DEBOUNCE_MS 1000 /* Debounce time for BJ plug/unplug */
diff --git a/board/glkrvp/chg_usb_pd.c b/board/glkrvp/chg_usb_pd.c
index e9108d641a..152e79142b 100644
--- a/board/glkrvp/chg_usb_pd.c
+++ b/board/glkrvp/chg_usb_pd.c
@@ -91,10 +91,20 @@ void board_vbus_enable(int port, int enable)
void tcpc_alert_event(enum gpio_signal signal)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ int port = -1;
+
+ switch (signal) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
+ return;
+ }
+
+ schedule_deferred_pd_interrupt(port);
}
void board_tcpc_init(void)
diff --git a/board/kukui/board.c b/board/kukui/board.c
index 48bb590dad..76f709d2db 100644
--- a/board/kukui/board.c
+++ b/board/kukui/board.c
@@ -48,10 +48,7 @@
static void tcpc_alert_event(enum gpio_signal signal)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(0 /* port */);
}
static void warm_reset_request_interrupt(enum gpio_signal signal)
diff --git a/board/nami/board.c b/board/nami/board.c
index 7dc8a7cefa..58c9ba2628 100644
--- a/board/nami/board.c
+++ b/board/nami/board.c
@@ -95,17 +95,20 @@ const int keyboard_factory_scan_pins_used =
static void tcpc_alert_event(enum gpio_signal signal)
{
- if ((signal == GPIO_USB_C0_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C0_PD_RST_L))
- return;
- else if ((signal == GPIO_USB_C1_PD_INT_ODL) &&
- gpio_get_level(GPIO_USB_C1_PD_RST))
+ int port = -1;
+
+ switch (signal) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
return;
+ }
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(port);
}
/* Set PD discharge whenever VBUS detection is high (i.e. below threshold). */
diff --git a/board/nocturne/board.c b/board/nocturne/board.c
index f3aafed99c..a79c5d36a2 100644
--- a/board/nocturne/board.c
+++ b/board/nocturne/board.c
@@ -47,10 +47,20 @@
static void tcpc_alert_event(enum gpio_signal s)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ int port = -1;
+
+ switch (s) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
+ return;
+ }
+
+ schedule_deferred_pd_interrupt(port);
}
/*
diff --git a/board/rainier/board.c b/board/rainier/board.c
index e0831301ce..04b93db208 100644
--- a/board/rainier/board.c
+++ b/board/rainier/board.c
@@ -46,10 +46,7 @@
static void tcpc_alert_event(enum gpio_signal signal)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(0 /* port */);
}
static void overtemp_interrupt(enum gpio_signal signal)
diff --git a/board/reef/board.c b/board/reef/board.c
index 6df8b781ef..eb3e0bd48c 100644
--- a/board/reef/board.c
+++ b/board/reef/board.c
@@ -66,18 +66,20 @@
static void tcpc_alert_event(enum gpio_signal signal)
{
- if ((signal == GPIO_USB_C0_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C0_PD_RST_L))
- return;
+ int port = -1;
- if ((signal == GPIO_USB_C1_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C1_PD_RST_ODL))
+ switch (signal) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
return;
+ }
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(port);
}
#ifdef CONFIG_USB_PD_TCPC_LOW_POWER
diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c
index 4efe7dcdb3..6e9ad3e031 100644
--- a/board/reef_mchp/board.c
+++ b/board/reef_mchp/board.c
@@ -100,18 +100,20 @@ void board_config_pre_init(void)
*/
static void tcpc_alert_event(enum gpio_signal signal)
{
- if ((signal == GPIO_USB_C0_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C0_PD_RST_L))
- return;
+ int port = -1;
- if ((signal == GPIO_USB_C1_PD_INT_ODL) &&
- !gpio_get_level(GPIO_USB_C1_PD_RST_ODL))
+ switch (signal) {
+ case GPIO_USB_C0_PD_INT_ODL:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_ODL:
+ port = 1;
+ break;
+ default:
return;
+ }
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(port);
}
#ifdef CONFIG_USB_PD_TCPC_LOW_POWER
diff --git a/board/rowan/board.c b/board/rowan/board.c
index 2a0c7b4f0f..ec80d70732 100644
--- a/board/rowan/board.c
+++ b/board/rowan/board.c
@@ -59,10 +59,7 @@
void pd_mcu_interrupt(enum gpio_signal signal)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with PD MCU to determine interrupt cause */
- host_command_pd_send_status(0);
-#endif
+ schedule_deferred_pd_interrupt(0 /* port */);
}
void deferred_reset_pd_mcu(void);
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index cf061a9b8c..b7181b2a8a 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -48,10 +48,7 @@
static void tcpc_alert_event(enum gpio_signal signal)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ schedule_deferred_pd_interrupt(0 /* port */);
}
static void overtemp_interrupt(enum gpio_signal signal)
diff --git a/board/zoombini/board.c b/board/zoombini/board.c
index 9d264b1fbf..cb9e49a70b 100644
--- a/board/zoombini/board.c
+++ b/board/zoombini/board.c
@@ -51,10 +51,25 @@
static void tcpc_alert_event(enum gpio_signal s)
{
-#ifdef HAS_TASK_PDCMD
- /* Exchange status with TCPCs */
- host_command_pd_send_status(PD_CHARGE_NO_CHANGE);
-#endif
+ int port = -1;
+
+ switch (s) {
+ case GPIO_USB_C0_PD_INT_L:
+ port = 0;
+ break;
+ case GPIO_USB_C1_PD_INT_L:
+ port = 1;
+ break;
+#ifdef BOARD_ZOOMBINI
+ case GPIO_USB_C2_PD_INT_L:
+ port = 2;
+ break;
+#endif /* defined(BOARD_ZOOMBINI) */
+ default:
+ return;
+ }
+
+ schedule_deferred_pd_interrupt(port);
}
#ifdef BOARD_MEOWTH
View Lorry Controller Status