herobrine: fix parity on tcpc reset line

the original tcpc reset pins was not configured to ACTIVE_LOW so all
logic involving the tcpc reset 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: I0053091f15093bdc9a8a6f6a024f46d2b104a54a
Signed-off-by: Jason Yuan <jasonyuan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4329091
Reviewed-by: Wai-Hong Tam <waihong@google.com>
Tested-by: zhi cheng yuan <jasonyuan@chromium.org>
Commit-Queue: Wai-Hong Tam <waihong@google.com>
Auto-Submit: zhi cheng yuan <jasonyuan@chromium.org>

8 files changed, 22 insertions, 22 deletions

diff --git a/zephyr/program/herobrine/evoker/gpio.dtsi b/zephyr/program/herobrine/evoker/gpio.dtsi
index 0103f7cb6b..65aa63ffec 100644
--- a/zephyr/program/herobrine/evoker/gpio.dtsi
+++ b/zephyr/program/herobrine/evoker/gpio.dtsi
@@ -143,10 +143,10 @@
 			gpios = <&gpio7 4 GPIO_OUTPUT_LOW>;
 		};
 		gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l {
-			gpios = <&gpiof 1 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpiof 1 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l {
-			gpios = <&gpioe 4 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpioe 4 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_dp_mux_oe_l: dp_mux_oe_l {
 			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
diff --git a/zephyr/program/herobrine/gpio.dtsi b/zephyr/program/herobrine/gpio.dtsi
index 9c982f0ef9..b4befe82ce 100644
--- a/zephyr/program/herobrine/gpio.dtsi
+++ b/zephyr/program/herobrine/gpio.dtsi
@@ -146,10 +146,10 @@
 			gpios = <&gpio7 4 GPIO_OUTPUT_LOW>;
 		};
 		gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l {
-			gpios = <&gpiof 1 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpiof 1 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l {
-			gpios = <&gpioe 4 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpioe 4 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_dp_mux_oe_l: dp_mux_oe_l {
 			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
diff --git a/zephyr/program/herobrine/hoglin/gpio.dtsi b/zephyr/program/herobrine/hoglin/gpio.dtsi
index 72f5fb510d..cf5a894730 100644
--- a/zephyr/program/herobrine/hoglin/gpio.dtsi
+++ b/zephyr/program/herobrine/hoglin/gpio.dtsi
@@ -146,10 +146,10 @@
 			gpios = <&gpio7 4 GPIO_OUTPUT_LOW>;
 		};
 		gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l {
-			gpios = <&gpiof 1 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpiof 1 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l {
-			gpios = <&gpioe 4 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpioe 4 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_dp_mux_oe_l: dp_mux_oe_l {
 			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
diff --git a/zephyr/program/herobrine/src/usbc_config.c b/zephyr/program/herobrine/src/usbc_config.c
index 955e13062d..c9ee477cef 100644
--- a/zephyr/program/herobrine/src/usbc_config.c
+++ b/zephyr/program/herobrine/src/usbc_config.c
@@ -145,11 +145,11 @@ void board_reset_pd_mcu(void)
 	cprints(CC_USB, "Resetting TCPCs...");
 	cflush();
 
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l), 0);
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l), 0);
-	msleep(PS8XXX_RESET_DELAY_MS);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l), 1);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l), 1);
+	msleep(PS8XXX_RESET_DELAY_MS);
+	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l), 0);
+	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l), 0);
 	msleep(PS8805_FW_INIT_DELAY_MS);
 }
 
@@ -254,11 +254,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(
+		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(
+		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 9c94926579..bf124d8013 100644
--- a/zephyr/program/herobrine/villager/gpio.dtsi
+++ b/zephyr/program/herobrine/villager/gpio.dtsi
@@ -146,10 +146,10 @@
 			gpios = <&gpio7 4 GPIO_OUTPUT_LOW>;
 		};
 		gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l {
-			gpios = <&gpiof 1 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpiof 1 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l {
-			gpios = <&gpioe 4 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpioe 4 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_dp_mux_oe_l: dp_mux_oe_l {
 			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
diff --git a/zephyr/program/herobrine/zombie/gpio.dtsi b/zephyr/program/herobrine/zombie/gpio.dtsi
index 6f0e0ed501..8ec3a192b1 100644
--- a/zephyr/program/herobrine/zombie/gpio.dtsi
+++ b/zephyr/program/herobrine/zombie/gpio.dtsi
@@ -146,10 +146,10 @@
 			gpios = <&gpio7 4 GPIO_OUTPUT_LOW>;
 		};
 		gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l {
-			gpios = <&gpiof 1 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpiof 1 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l {
-			gpios = <&gpioe 4 GPIO_OUTPUT_HIGH>;
+			gpios = <&gpioe 4 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_dp_mux_oe_l: dp_mux_oe_l {
 			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
diff --git a/zephyr/program/trogdor/lazor/gpio.dts b/zephyr/program/trogdor/lazor/gpio.dts
index 053864a23a..92d54a59e3 100644
--- a/zephyr/program/trogdor/lazor/gpio.dts
+++ b/zephyr/program/trogdor/lazor/gpio.dts
@@ -166,10 +166,10 @@
 			gpios = <&gpio7 4 GPIO_OUTPUT_LOW>;
 		};
 		gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l {
-			gpios = <&gpiof 1 GPIO_ODR_HIGH>;
+			gpios = <&gpiof 1 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l {
-			gpios = <&gpioe 4 GPIO_ODR_HIGH>;
+			gpios = <&gpioe 4 (GPIO_ODR_HIGH | GPIO_ACTIVE_LOW)>;
 		};
 		gpio_dp_mux_oe_l: dp_mux_oe_l {
 			gpios = <&gpio9 6 GPIO_ODR_HIGH>;
diff --git a/zephyr/program/trogdor/lazor/src/usbc_config.c b/zephyr/program/trogdor/lazor/src/usbc_config.c
index b3a768849c..720d768d9e 100644
--- a/zephyr/program/trogdor/lazor/src/usbc_config.c
+++ b/zephyr/program/trogdor/lazor/src/usbc_config.c
@@ -191,11 +191,11 @@ void board_reset_pd_mcu(void)
 	cprints(CC_USB, "Resetting TCPCs...");
 	cflush();
 
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l), 0);
-	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l), 0);
-	msleep(PS8XXX_RESET_DELAY_MS);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l), 1);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l), 1);
+	msleep(PS8XXX_RESET_DELAY_MS);
+	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_pd_rst_l), 0);
+	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l), 0);
 }
 
 void board_set_tcpc_power_mode(int port, int mode)
@@ -299,11 +299,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(
+		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(
+		if (!gpio_pin_get_dt(
 			    GPIO_DT_FROM_NODELABEL(gpio_usb_c1_pd_rst_l)))
 			status |= PD_STATUS_TCPC_ALERT_1;