diff options
| author | Jason Yuan <jasonyuan@google.com> | 2023-03-09 15:49:35 -0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-03-13 20:45:48 +0000 |
| commit | 4b446daddd9815263d86d8112879fae3a3fc9856 (patch) | |
| tree | 4e37fe9c8bd39a37d293ce4f3e3f9664ffa83de0 | |
| parent | b5b0f38a64d96d9014cbb025ae9bf2546881cbb0 (diff) | |
| download | chrome-ec-4b446daddd9815263d86d8112879fae3a3fc9856.tar.gz | |
skyrim: fix polarity on tcpc reset line
This CL adds the ACTIVE_LOW flag to the TCPC reset line.
BUG=b:254148652
TEST=none
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: Id069727d80ac67c9ec55ea42e8334e39394d088d
Signed-off-by: Jason Yuan <jasonyuan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4327416
Auto-Submit: zhi cheng yuan <jasonyuan@chromium.org>
Tested-by: Diana Z <dzigterman@chromium.org>
Tested-by: zhi cheng yuan <jasonyuan@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: zhi cheng yuan <jasonyuan@chromium.org>
| -rw-r--r-- | zephyr/program/skyrim/gpio.dtsi | 4 | ||||
| -rw-r--r-- | zephyr/program/skyrim/src/usbc_config.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/zephyr/program/skyrim/gpio.dtsi b/zephyr/program/skyrim/gpio.dtsi index d5b648e64c..fe92fab785 100644 --- a/zephyr/program/skyrim/gpio.dtsi +++ b/zephyr/program/skyrim/gpio.dtsi @@ -99,11 +99,11 @@ enum-name = "GPIO_USB_C1_BC12_INT_ODL"; }; gpio_usb_c0_tcpc_rst_l: usb_c0_tcpc_rst_l { - gpios = <&gpio3 4 GPIO_OUTPUT_HIGH>; + gpios = <&gpio3 4 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>; enum-name = "GPIO_USB_C0_TCPC_RST_L"; }; gpio_usb_c1_tcpc_rst_l: usb_c1_tcpc_rst_l { - gpios = <&gpio3 7 GPIO_OUTPUT_HIGH>; + gpios = <&gpio3 7 (GPIO_OUTPUT_HIGH | GPIO_ACTIVE_LOW)>; enum-name = "GPIO_USB_C1_TCPC_RST_L"; }; usb_c0_hpd { diff --git a/zephyr/program/skyrim/src/usbc_config.c b/zephyr/program/skyrim/src/usbc_config.c index 706d40efdd..3953b11f41 100644 --- a/zephyr/program/skyrim/src/usbc_config.c +++ b/zephyr/program/skyrim/src/usbc_config.c @@ -272,9 +272,9 @@ static void reset_nct38xx_port(int port) gpio_save_port_config(ioex_port1, saved_port1_flags, ARRAY_SIZE(saved_port1_flags)); - gpio_pin_set_dt(reset_gpio_l, 0); - msleep(NCT38XX_RESET_HOLD_DELAY_MS); gpio_pin_set_dt(reset_gpio_l, 1); + msleep(NCT38XX_RESET_HOLD_DELAY_MS); + gpio_pin_set_dt(reset_gpio_l, 0); nct38xx_reset_notify(port); if (NCT3807_RESET_POST_DELAY_MS != 0) msleep(NCT3807_RESET_POST_DELAY_MS); @@ -316,13 +316,13 @@ uint16_t tcpc_get_alert_status(void) * its reset line active. */ if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c0_tcpc_int_odl))) { - if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL( + if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL( gpio_usb_c0_tcpc_rst_l)) != 0) status |= PD_STATUS_TCPC_ALERT_0; } if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_usb_c1_tcpc_int_odl))) { - if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL( + if (!gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL( gpio_usb_c1_tcpc_rst_l)) != 0) status |= PD_STATUS_TCPC_ALERT_1; } |