summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Yuan <jasonyuan@google.com>2023-03-07 13:18:17 -0800
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-03-09 17:23:44 +0000
commitad4178e2ec6bc69f567bb2bf995e4ccf8750192a (patch)
tree69c8bd18eb17cd10e09d1ed7d04aff79332d138b
parentb0d9abe0788c1ba502e74d10c7e06d59b5e83fd7 (diff)
downloadchrome-ec-ad4178e2ec6bc69f567bb2bf995e4ccf8750192a.tar.gz
herobrine: fix parity on tcpc interrupts
the original tcpc interrupt pins was not configured to ACTIVE_LOW so all logic involving the tcpc interrupt pins were reversed. This patch seeks to move to Zephyr conventions for tcpc gpios. Lazor is also included in this CL. BUG=b:254148652 TEST=usbc charging on villager, lazor BRANCH=none LOW_COVERAGE_REASON=Some untested code have been simplified, which does not actually reduce code coverage even though it is technically uncovered. Change-Id: Ic7dd8be1063fe5876927f200e1bf5cc4507d4014 Signed-off-by: Jason Yuan <jasonyuan@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4316740 Reviewed-by: Keith Short <keithshort@chromium.org> Commit-Queue: Keith Short <keithshort@chromium.org> Reviewed-by: Wai-Hong Tam <waihong@google.com> Auto-Submit: zhi cheng yuan <jasonyuan@chromium.org> Tested-by: zhi cheng yuan <jasonyuan@chromium.org>
Diffstat
-rw-r--r--zephyr/program/herobrine/evoker/gpio.dtsi4
-rw-r--r--zephyr/program/herobrine/gpio.dtsi4
-rw-r--r--zephyr/program/herobrine/hoglin/gpio.dtsi4
-rw-r--r--zephyr/program/herobrine/src/usbc_config.c4
-rw-r--r--zephyr/program/herobrine/villager/gpio.dtsi4
-rw-r--r--zephyr/program/herobrine/zombie/gpio.dtsi4
-rw-r--r--zephyr/program/trogdor/lazor/gpio.dts4
-rw-r--r--zephyr/program/trogdor/lazor/src/usbc_config.c4
8 files changed, 16 insertions, 16 deletions
diff --git a/zephyr/program/herobrine/evoker/gpio.dtsi b/zephyr/program/herobrine/evoker/gpio.dtsi
index 935ce8c719..e16191f247 100644
--- a/zephyr/program/herobrine/evoker/gpio.dtsi
+++ b/zephyr/program/herobrine/evoker/gpio.dtsi
@@ -13,11 +13,11 @@
compatible = "named-gpios";
gpio_usb_c0_pd_int_odl: usb_c0_pd_int_odl {
- gpios = <&gpioe 0 GPIO_INPUT>;
+ gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C0_PD_INT_ODL";
};
gpio_usb_c1_pd_int_odl: usb_c1_pd_int_odl {
- gpios = <&gpiof 5 GPIO_INPUT>;
+ gpios = <&gpiof 5 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C1_PD_INT_ODL";
};
gpio_usb_c0_swctl_int_odl: usb_c0_swctl_int_odl {
diff --git a/zephyr/program/herobrine/gpio.dtsi b/zephyr/program/herobrine/gpio.dtsi
index e484e335cf..7245c3466f 100644
--- a/zephyr/program/herobrine/gpio.dtsi
+++ b/zephyr/program/herobrine/gpio.dtsi
@@ -13,11 +13,11 @@
compatible = "named-gpios";
gpio_usb_c0_pd_int_odl: usb_c0_pd_int_odl {
- gpios = <&gpioe 0 GPIO_INPUT>;
+ gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C0_PD_INT_ODL";
};
gpio_usb_c1_pd_int_odl: usb_c1_pd_int_odl {
- gpios = <&gpiof 5 GPIO_INPUT>;
+ gpios = <&gpiof 5 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C1_PD_INT_ODL";
};
gpio_usb_c0_swctl_int_odl: usb_c0_swctl_int_odl {
diff --git a/zephyr/program/herobrine/hoglin/gpio.dtsi b/zephyr/program/herobrine/hoglin/gpio.dtsi
index 8f75141f95..43162b3de9 100644
--- a/zephyr/program/herobrine/hoglin/gpio.dtsi
+++ b/zephyr/program/herobrine/hoglin/gpio.dtsi
@@ -13,11 +13,11 @@
compatible = "named-gpios";
gpio_usb_c0_pd_int_odl: usb_c0_pd_int_odl {
- gpios = <&gpioe 0 GPIO_INPUT>;
+ gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C0_PD_INT_ODL";
};
gpio_usb_c1_pd_int_odl: usb_c1_pd_int_odl {
- gpios = <&gpiof 5 GPIO_INPUT>;
+ gpios = <&gpiof 5 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C1_PD_INT_ODL";
};
gpio_usb_c0_swctl_int_odl: usb_c0_swctl_int_odl {
diff --git a/zephyr/program/herobrine/src/usbc_config.c b/zephyr/program/herobrine/src/usbc_config.c
index 69620a02b4..955e13062d 100644
--- a/zephyr/program/herobrine/src/usbc_config.c
+++ b/zephyr/program/herobrine/src/usbc_config.c
@@ -253,11 +253,11 @@ uint16_t tcpc_get_alert_status(void)
{
uint16_t status = 0;
- if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_int_odl)))
+ if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_int_odl)))
if (gpio_pin_get_dt(
GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l)))
status |= PD_STATUS_TCPC_ALERT_0;
- if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_int_odl)))
+ if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_int_odl)))
if (gpio_pin_get_dt(
GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l)))
status |= PD_STATUS_TCPC_ALERT_1;
diff --git a/zephyr/program/herobrine/villager/gpio.dtsi b/zephyr/program/herobrine/villager/gpio.dtsi
index 049ac74bcb..b947e5acd6 100644
--- a/zephyr/program/herobrine/villager/gpio.dtsi
+++ b/zephyr/program/herobrine/villager/gpio.dtsi
@@ -13,11 +13,11 @@
compatible = "named-gpios";
gpio_usb_c0_pd_int_odl: usb_c0_pd_int_odl {
- gpios = <&gpioe 0 GPIO_INPUT>;
+ gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C0_PD_INT_ODL";
};
gpio_usb_c1_pd_int_odl: usb_c1_pd_int_odl {
- gpios = <&gpiof 5 GPIO_INPUT>;
+ gpios = <&gpiof 5 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C1_PD_INT_ODL";
};
gpio_usb_c0_swctl_int_odl: usb_c0_swctl_int_odl {
diff --git a/zephyr/program/herobrine/zombie/gpio.dtsi b/zephyr/program/herobrine/zombie/gpio.dtsi
index ad60b945b9..c554a079d8 100644
--- a/zephyr/program/herobrine/zombie/gpio.dtsi
+++ b/zephyr/program/herobrine/zombie/gpio.dtsi
@@ -13,11 +13,11 @@
compatible = "named-gpios";
gpio_usb_c0_pd_int_odl: usb_c0_pd_int_odl {
- gpios = <&gpioe 0 GPIO_INPUT>;
+ gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C0_PD_INT_ODL";
};
gpio_usb_c1_pd_int_odl: usb_c1_pd_int_odl {
- gpios = <&gpiof 5 GPIO_INPUT>;
+ gpios = <&gpiof 5 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C1_PD_INT_ODL";
};
gpio_usb_c0_swctl_int_odl: usb_c0_swctl_int_odl {
diff --git a/zephyr/program/trogdor/lazor/gpio.dts b/zephyr/program/trogdor/lazor/gpio.dts
index bb40904771..053864a23a 100644
--- a/zephyr/program/trogdor/lazor/gpio.dts
+++ b/zephyr/program/trogdor/lazor/gpio.dts
@@ -15,11 +15,11 @@
compatible = "named-gpios";
gpio_usb_c0_pd_int_odl: usb_c0_pd_int_odl {
- gpios = <&gpioe 0 GPIO_INPUT>;
+ gpios = <&gpioe 0 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C0_PD_INT_ODL";
};
gpio_usb_c1_pd_int_odl: usb_c1_pd_int_odl {
- gpios = <&gpiof 5 GPIO_INPUT>;
+ gpios = <&gpiof 5 (GPIO_INPUT | GPIO_ACTIVE_LOW)>;
enum-name = "GPIO_USB_C1_PD_INT_ODL";
};
gpio_usb_c0_swctl_int_odl: usb_c0_swctl_int_odl {
diff --git a/zephyr/program/trogdor/lazor/src/usbc_config.c b/zephyr/program/trogdor/lazor/src/usbc_config.c
index d8cafee7a3..b3a768849c 100644
--- a/zephyr/program/trogdor/lazor/src/usbc_config.c
+++ b/zephyr/program/trogdor/lazor/src/usbc_config.c
@@ -298,11 +298,11 @@ uint16_t tcpc_get_alert_status(void)
{
uint16_t status = 0;
- if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_int_odl)))
+ if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_int_odl)))
if (gpio_pin_get_dt(
GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l)))
status |= PD_STATUS_TCPC_ALERT_0;
- if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_int_odl)))
+ if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_int_odl)))
if (gpio_pin_get_dt(
GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l)))
status |= PD_STATUS_TCPC_ALERT_1;
View Lorry Controller Status