diff options
| author | Keith Short <keithshort@chromium.org> | 2022-03-15 13:45:33 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-03-16 00:48:52 +0000 |
| commit | 2e34608dccb49c11da3aca8fddaf7247ba3cb54f (patch) | |
| tree | 0131874e089f8218121b87f8c82c21a970585cb6 | |
| parent | a1bcb811202d660d20666db5bca1362fc5f1c4dd (diff) | |
| download | chrome-ec-2e34608dccb49c11da3aca8fddaf7247ba3cb54f.tar.gz | |
zephyr: Remove use of GPIO_OUT_HIGH/LOW from dts files
The correct Zephyr GPIO flags are GPIO_OUTPUT_HIGH and GPIO_OUTPUT_LOW.
Use these flags in place of GPIO_OUT_HIGH and GPIO_OUT_LOW in all
devicetree files.
BUG=b:224821728
BRANCH=none
TEST=zmake testall
TEST=verify Herobrine boots the AP
Signed-off-by: Keith Short <keithshort@chromium.org>
Change-Id: I3b21920a7da21973467dfcf04de5bed7a2bdb2c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3526269
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
20 files changed, 198 insertions, 204 deletions
diff --git a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts index c060a842f3..1c24c1cf45 100644 --- a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts +++ b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts @@ -44,11 +44,11 @@ enum-name = "GPIO_PCH_RSMRST_L"; }; sys_reset_l { - gpios = <&gpiob 6 GPIO_OUT_HIGH>; + gpios = <&gpiob 6 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_SYS_RESET_L"; }; gpio_ec_pch_wake_odl: pch_wake_l { - gpios = <&gpiob 7 GPIO_OUT_HIGH>; + gpios = <&gpiob 7 GPIO_OUTPUT_HIGH>; }; i2c_a_scl { gpios = <&gpiob 3 GPIO_INPUT>; @@ -268,9 +268,9 @@ /* gpioj5 */ <&gpioj 5 GPIO_INPUT_PULL_DOWN>, /* gpioj6 */ - <&gpioj 6 GPIO_OUT_LOW>, + <&gpioj 6 GPIO_OUTPUT_LOW>, /* gpioj7 */ - <&gpioj 7 GPIO_OUT_LOW>, + <&gpioj 7 GPIO_OUTPUT_LOW>, /* gpiom0 */ <&gpiom 0 GPIO_INPUT_PULL_DOWN>, diff --git a/zephyr/dts/board-overlays/native_posix.dts b/zephyr/dts/board-overlays/native_posix.dts index a9a65d63c7..7801997553 100644 --- a/zephyr/dts/board-overlays/native_posix.dts +++ b/zephyr/dts/board-overlays/native_posix.dts @@ -10,7 +10,7 @@ compatible = "named-gpios"; entering_rw { - gpios = <&gpio0 1 GPIO_OUT_LOW>; + gpios = <&gpio0 1 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; }; diff --git a/zephyr/include/dt-bindings/gpio_defines.h b/zephyr/include/dt-bindings/gpio_defines.h index 81156d0f92..cc73dd6382 100644 --- a/zephyr/include/dt-bindings/gpio_defines.h +++ b/zephyr/include/dt-bindings/gpio_defines.h @@ -1,7 +1,7 @@ /* - * Copyright 2020 Google LLC. - * - * SPDX-License-Identifier: Apache-2.0 + * Copyright 2022 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ #ifndef DT_BINDINGS_GPIO_DEFINES_H_ #define DT_BINDINGS_GPIO_DEFINES_H_ @@ -44,17 +44,11 @@ /* Configures GPIO pin as input with pull-down. */ #define GPIO_INPUT_PULL_DOWN (GPIO_INPUT | GPIO_PULL_DOWN) -/** Configures GPIO pin as output and initializes it to a low state. */ -#define GPIO_OUT_LOW (GPIO_OUTPUT | GPIO_OUTPUT_INIT_LOW) - -/** Configures GPIO pin as output and initializes it to a high state. */ -#define GPIO_OUT_HIGH (GPIO_OUTPUT | GPIO_OUTPUT_INIT_HIGH) - /** Configures GPIO pin as ODR output and initializes it to a low state. */ -#define GPIO_ODR_LOW (GPIO_OUT_LOW | GPIO_OPEN_DRAIN) +#define GPIO_ODR_LOW (GPIO_OUTPUT_LOW | GPIO_OPEN_DRAIN) /** Configures GPIO pin as ODR output and initializes it to a high state. */ -#define GPIO_ODR_HIGH (GPIO_OUT_HIGH | GPIO_OPEN_DRAIN) +#define GPIO_ODR_HIGH (GPIO_OUTPUT_HIGH | GPIO_OPEN_DRAIN) /* * GPIO interrupt flags, taken from <drivers/gpio.h> diff --git a/zephyr/projects/brya/brya/gpio.dts b/zephyr/projects/brya/brya/gpio.dts index 708eb58a11..8769a62e13 100644 --- a/zephyr/projects/brya/brya/gpio.dts +++ b/zephyr/projects/brya/brya/gpio.dts @@ -24,7 +24,7 @@ gpios = <&gpioa 1 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; }; charger_vap_otg_en { - gpios = <&gpio7 3 GPIO_OUT_LOW>; + gpios = <&gpio7 3 GPIO_OUTPUT_LOW>; }; gpio_ec_batt_pres_odl: ec_batt_pres_odl { gpios = <&gpioa 3 GPIO_INPUT>; @@ -35,7 +35,7 @@ * but only enabled for board id 1. */ gpio_id_1_ec_kb_bl_en: id_1_ec_kb_bl_en { - gpios = <&gpioa 3 GPIO_OUT_LOW>; + gpios = <&gpioa 3 GPIO_OUTPUT_LOW>; no-auto-init; }; gpio_id_1_ec_batt_pres_odl: id_1_ec_batt_pres_odl { @@ -48,7 +48,7 @@ gpios = <&gpio3 6 GPIO_INPUT>; }; gpio_ec_kb_bl_en_l: ec_kb_bl_en_l { - gpios = <&gpio8 6 GPIO_OUT_HIGH>; + gpios = <&gpio8 6 GPIO_OUTPUT_HIGH>; }; ec_i2c_misc_scl_r { gpios = <&gpiob 3 GPIO_INPUT>; @@ -93,13 +93,13 @@ gpios = <&gpiof 2 GPIO_INPUT>; }; ec_chg_led_y_c1 { - gpios = <&gpioc 3 GPIO_OUT_LOW>; + gpios = <&gpioc 3 GPIO_OUTPUT_LOW>; }; ec_chg_led_b_c1 { - gpios = <&gpioc 4 GPIO_OUT_LOW>; + gpios = <&gpioc 4 GPIO_OUTPUT_LOW>; }; ec_gsc_packet_mode { - gpios = <&gpio7 5 GPIO_OUT_LOW>; + gpios = <&gpio7 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; gpio_ec_accel_int_l: ec_accel_int_l { @@ -120,7 +120,7 @@ enum-name = "GPIO_AC_PRESENT"; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; gpio_ec_pch_wake_odl: ec_pch_wake_r_odl { gpios = <&gpioc 0 GPIO_ODR_HIGH>; @@ -134,7 +134,7 @@ enum-name = "GPIO_PG_EC_DSW_PWROK"; }; en_s5_rails { - gpios = <&gpiob 6 GPIO_OUT_LOW>; + gpios = <&gpiob 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_S5_RAILS"; }; sys_rst_odl { @@ -146,7 +146,7 @@ enum-name = "GPIO_PG_EC_RSMRST_ODL"; }; ec_pch_rsmrst_odl { - gpios = <&gpioa 6 GPIO_OUT_LOW>; + gpios = <&gpioa 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_RSMRST_L"; }; gpio_pg_ec_all_sys_pwrgd: pg_ec_all_sys_pwrgd { @@ -178,11 +178,11 @@ enum-name = "GPIO_SLP_SUS_L"; }; pch_pwrok { - gpios = <&gpio7 2 GPIO_OUT_LOW>; + gpios = <&gpio7 2 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_PWROK"; }; ec_pch_sys_pwrok { - gpios = <&gpio3 7 GPIO_OUT_LOW>; + gpios = <&gpio3 7 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EC_PCH_SYS_PWROK"; }; imvp9_vrrdy_od { @@ -190,14 +190,14 @@ enum-name = "GPIO_IMVP9_VRRDY_OD"; }; ec_edp_bl_en { - gpios = <&gpiod 3 GPIO_OUT_HIGH>; + gpios = <&gpiod 3 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_ENABLE_BACKLIGHT"; }; gpio_ec_prochot_in_l: ec_prochot_in_l { gpios = <&gpiof 0 GPIO_INPUT>; }; gpio_en_pp5000_fan: en_pp5000_fan { - gpios = <&gpio6 1 GPIO_OUT_HIGH>; + gpios = <&gpio6 1 GPIO_OUTPUT_HIGH>; }; gpio_ec_voldn_btn_odl: ec_voldn_btn_odl { gpios = <&gpio9 3 GPIO_INPUT_PULL_UP>; @@ -240,7 +240,7 @@ enum-name = "GPIO_USB_C2_BC12_INT_ODL"; }; en_pp5000_usba_r { - gpios = <&gpiod 7 GPIO_OUT_LOW>; + gpios = <&gpiod 7 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000_USBA_R"; }; usb_c1_rt_rst_r_odl { @@ -281,7 +281,7 @@ label = "IOEX_USB_C0_OC_ODL"; }; usb_c0_frs_en { - gpios = <&ioex_port1 6 GPIO_OUT_LOW>; + gpios = <&ioex_port1 6 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_FRS_EN"; label = "IOEX_USB_C0_FRS_EN"; }; @@ -306,7 +306,7 @@ label = "IOEX_USB_C2_OC_ODL"; }; usb_c2_frs_en { - gpios = <&ioex_port2 6 GPIO_OUT_LOW>; + gpios = <&ioex_port2 6 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C2_FRS_EN"; label = "IOEX_USB_C2_FRS_EN"; }; diff --git a/zephyr/projects/corsola/gpio_kingler.dts b/zephyr/projects/corsola/gpio_kingler.dts index 6d3cf7ed5a..8d7da1b484 100644 --- a/zephyr/projects/corsola/gpio_kingler.dts +++ b/zephyr/projects/corsola/gpio_kingler.dts @@ -43,7 +43,7 @@ enum-name = "GPIO_AP_IN_SLEEP_L"; }; gpio_en_ulp: en_ulp { - gpios = <&gpioc 6 GPIO_OUT_LOW>; + gpios = <&gpioc 6 GPIO_OUTPUT_LOW>; }; en_ec_id_odl { gpios = <&gpio7 6 GPIO_ODR_HIGH>; @@ -100,14 +100,14 @@ enum-name = "GPIO_EC_INT_L"; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; gpio_usb_c0_bc12_int_odl: usb_c0_bc12_int_odl { gpios = <&gpio8 3 GPIO_INPUT>; enum-name = "GPIO_USB_C0_BC12_INT_ODL"; }; ec_entering_rw { - gpios = <&gpio0 3 GPIO_OUT_LOW>; + gpios = <&gpio0 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; charger_prochot_odl { @@ -129,10 +129,10 @@ enum-name = "GPIO_POWER_BUTTON_L"; }; gpio_en_5v_usm: en_5v_usm { - gpios = <&gpio0 2 GPIO_OUT_LOW>; + gpios = <&gpio0 2 GPIO_OUTPUT_LOW>; }; packet_mode_en { - gpios = <&gpio0 2 GPIO_OUT_LOW>; + gpios = <&gpio0 2 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; gpio_x_ec_gpio2: x_ec_gpio2 { @@ -154,33 +154,33 @@ gpios = <&gpio7 0 GPIO_INPUT>; }; gpio_ec_x_gpio1: ec_x_gpio1 { - gpios = <&gpio6 2 GPIO_OUT_LOW>; + gpios = <&gpio6 2 GPIO_OUTPUT_LOW>; }; dp_aux_path_sel: dp_aux_path_sel { - gpios = <&gpio6 3 GPIO_OUT_LOW>; + gpios = <&gpio6 3 GPIO_OUTPUT_LOW>; }; gpio_ec_bl_en_od: ec_bl_en_od { gpios = <&gpio4 0 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>; }; gpio_ec_x_gpio3: ec_x_gpio3 { - gpios = <&gpiod 3 GPIO_OUT_LOW>; + gpios = <&gpiod 3 GPIO_OUTPUT_LOW>; }; gpio_usb_c0_tcpc_int_odl: usb_c0_tcpc_int_odl { gpios = <&gpio7 3 GPIO_INPUT>; enum-name = "GPIO_USB_C0_TCPC_INT_ODL"; }; gpio_usb_c0_tcpc_rst: usb_c0_tcpc_rst { - gpios = <&gpioc 0 GPIO_OUT_LOW>; + gpios = <&gpioc 0 GPIO_OUTPUT_LOW>; }; en_pp5000_usb_a0_vbus: en_pp5000_usb_a0_vbus_x { - gpios = <&gpio6 0 GPIO_OUT_LOW>; + gpios = <&gpio6 0 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000_USB_A0_VBUS"; }; gpio_hdmi_prsnt_odl: hdmi_prsnt_odl { gpios = <&gpio3 7 GPIO_INPUT>; }; en_pp5000_z2 { - gpios = <&gpio3 4 GPIO_OUT_HIGH>; + gpios = <&gpio3 4 GPIO_OUTPUT_HIGH>; }; gpio_usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl { gpios = <&gpioe 1 GPIO_INPUT>; diff --git a/zephyr/projects/corsola/gpio_krabby.dts b/zephyr/projects/corsola/gpio_krabby.dts index 6de525d06e..9fd347a751 100644 --- a/zephyr/projects/corsola/gpio_krabby.dts +++ b/zephyr/projects/corsola/gpio_krabby.dts @@ -77,10 +77,10 @@ enum-name = "GPIO_EC_PMIC_EN_ODL"; }; en_pp5000_z2: en_pp5000_z2 { - gpios = <&gpioc 6 GPIO_OUT_HIGH>; + gpios = <&gpioc 6 GPIO_OUTPUT_HIGH>; }; gpio_en_ulp: en_ulp { - gpios = <&gpioe 3 GPIO_OUT_LOW>; + gpios = <&gpioe 3 GPIO_OUTPUT_LOW>; }; sys_rst_odl: sys_rst_odl { gpios = <&gpiog 1 GPIO_ODR_LOW>; @@ -104,13 +104,13 @@ enum-name = "GPIO_EC_INT_L"; }; dp_aux_path_sel: dp_aux_path_sel { - gpios = <&gpiog 0 GPIO_OUT_HIGH>; + gpios = <&gpiog 0 GPIO_OUTPUT_HIGH>; }; ec_ap_dp_hpd_odl: ec_ap_dp_hpd_odl { gpios = <&gpioj 0 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>; }; en_pp5000_usb_a0_vbus: en_pp5000_usb_a0_vbus { - gpios = <&gpiob 7 GPIO_OUT_LOW>; + gpios = <&gpiob 7 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000_USB_A0_VBUS"; }; usb_c0_ppc_frsinfo: usb_c0_ppc_frsinfo { @@ -124,11 +124,11 @@ gpios = <&gpioh 5 GPIO_ODR_HIGH>; }; entering_rw: entering_rw { - gpios = <&gpioc 5 GPIO_OUT_LOW>; + gpios = <&gpioc 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; gpio_en_5v_usm: en_5v_usm { - gpios = <&gpiog 3 GPIO_OUT_LOW>; + gpios = <&gpiog 3 GPIO_OUTPUT_LOW>; }; usb_a0_fault_odl: usb_a0_fault_odl { gpios = <&gpioj 6 GPIO_INPUT>; @@ -170,16 +170,16 @@ gpios = <&gpioa 5 GPIO_INPUT>; }; gpio_ec_x_gpio1: ec_x_gpio1 { - gpios = <&gpioh 4 GPIO_OUT_LOW>; + gpios = <&gpioh 4 GPIO_OUTPUT_LOW>; }; gpio_ec_x_gpio3: ec_x_gpio3 { - gpios = <&gpioj 1 GPIO_OUT_LOW>; + gpios = <&gpioj 1 GPIO_OUTPUT_LOW>; }; gpio_hdmi_prsnt_odl: hdmi_prsnt_odl { gpios = <&gpioj 3 GPIO_INPUT>; }; gpio_packet_mode_en: packet_mode_en { - gpios = <&gpiod 4 GPIO_OUT_LOW>; + gpios = <&gpiod 4 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; }; @@ -231,10 +231,10 @@ /* spi_clk_gpg6 */ <&gpiog 6 GPIO_INPUT_PULL_UP>, /* spi_mosi_gpg4 */ - <&gpiog 4 GPIO_OUT_LOW>, + <&gpiog 4 GPIO_OUTPUT_LOW>, /* spi_miso_gpg5 */ - <&gpiog 5 GPIO_OUT_LOW>, + <&gpiog 5 GPIO_OUTPUT_LOW>, /* spi_cs_gpg7 */ - <&gpiog 7 GPIO_OUT_LOW>; + <&gpiog 7 GPIO_OUTPUT_LOW>; }; }; diff --git a/zephyr/projects/herobrine/gpio.dts b/zephyr/projects/herobrine/gpio.dts index 59211b75d3..288bb97b17 100644 --- a/zephyr/projects/herobrine/gpio.dts +++ b/zephyr/projects/herobrine/gpio.dts @@ -94,7 +94,7 @@ gpios = <&gpio0 2 GPIO_INPUT>; }; ec_entering_rw { - gpios = <&gpio7 2 GPIO_OUT_LOW>; + gpios = <&gpio7 2 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; ccd_mode_odl { @@ -106,7 +106,7 @@ enum-name = "GPIO_BATT_PRES_ODL"; }; ec_gsc_packet_mode { - gpios = <&gpio8 3 GPIO_OUT_LOW>; + gpios = <&gpio8 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; pmic_resin_l { @@ -122,11 +122,11 @@ enum-name = "GPIO_EC_INT_L"; }; gpio_switchcap_on: switchcap_on { - gpios = <&gpiod 5 GPIO_OUT_LOW>; + gpios = <&gpiod 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_SWITCHCAP_ON"; }; gpio_en_pp5000_s5: en_pp5000_s5 { - gpios = <&gpio7 3 GPIO_OUT_HIGH>; + gpios = <&gpio7 3 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_EN_PP5000"; }; ec_bl_disable_l { @@ -142,48 +142,48 @@ gpios = <&gpioa 1 GPIO_INPUT>; }; tp_int_gate { - gpios = <&gpio7 4 GPIO_OUT_LOW>; + gpios = <&gpio7 4 GPIO_OUTPUT_LOW>; }; gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l { - gpios = <&gpiof 1 GPIO_OUT_HIGH>; + gpios = <&gpiof 1 GPIO_OUTPUT_HIGH>; }; gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l { - gpios = <&gpioe 4 GPIO_OUT_HIGH>; + gpios = <&gpioe 4 GPIO_OUTPUT_HIGH>; }; gpio_dp_mux_oe_l: dp_mux_oe_l { gpios = <&gpiob 1 GPIO_ODR_HIGH>; }; gpio_dp_mux_sel: dp_mux_sel { - gpios = <&gpio4 5 GPIO_OUT_LOW>; + gpios = <&gpio4 5 GPIO_OUTPUT_LOW>; }; gpio_dp_hot_plug_det_r: dp_hot_plug_det_r { - gpios = <&gpio9 5 GPIO_OUT_LOW>; + gpios = <&gpio9 5 GPIO_OUTPUT_LOW>; }; gpio_en_usb_a_5v: en_usb_a_5v { - gpios = <&gpiof 0 GPIO_OUT_LOW>; + gpios = <&gpiof 0 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_USB_A_5V"; }; usb_a_cdp_ilim_en_l { - gpios = <&gpio7 5 GPIO_OUT_HIGH>; + gpios = <&gpio7 5 GPIO_OUTPUT_HIGH>; }; usb_c0_frs_en { - gpios = <&gpioc 5 GPIO_OUT_LOW>; + gpios = <&gpioc 5 GPIO_OUTPUT_LOW>; }; usb_c1_frs_en { - gpios = <&gpioc 1 GPIO_OUT_LOW>; + gpios = <&gpioc 1 GPIO_OUTPUT_LOW>; enum-name = "GPIO_USB_C1_FRS_EN"; }; gpio_ec_chg_led_y_c0: ec_chg_led_y_c0 { - gpios = <&gpio6 0 GPIO_OUT_LOW>; + gpios = <&gpio6 0 GPIO_OUTPUT_LOW>; }; gpio_ec_chg_led_w_c0: ec_chg_led_w_c0 { - gpios = <&gpioc 0 GPIO_OUT_LOW>; + gpios = <&gpioc 0 GPIO_OUTPUT_LOW>; }; gpio_ec_chg_led_y_c1: ec_chg_led_y_c1 { - gpios = <&gpioc 3 GPIO_OUT_LOW>; + gpios = <&gpioc 3 GPIO_OUTPUT_LOW>; }; gpio_ec_chg_led_w_c1: ec_chg_led_w_c1 { - gpios = <&gpioc 4 GPIO_OUT_LOW>; + gpios = <&gpioc 4 GPIO_OUTPUT_LOW>; }; ap_ec_spi_mosi { gpios = <&gpio4 6 GPIO_INPUT_PULL_DOWN>; @@ -220,10 +220,10 @@ enum-name = "GPIO_SWITCHCAP_PG"; }; arm_x86 { - gpios = <&gpio6 6 GPIO_OUT_LOW>; + gpios = <&gpio6 6 GPIO_OUTPUT_LOW>; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; }; diff --git a/zephyr/projects/herobrine/gpio_hoglin.dts b/zephyr/projects/herobrine/gpio_hoglin.dts index f7c87aba82..e74611d3ef 100644 --- a/zephyr/projects/herobrine/gpio_hoglin.dts +++ b/zephyr/projects/herobrine/gpio_hoglin.dts @@ -94,7 +94,7 @@ gpios = <&gpio0 2 GPIO_INPUT>; }; ec_entering_rw { - gpios = <&gpio7 2 GPIO_OUT_LOW>; + gpios = <&gpio7 2 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; ccd_mode_odl { @@ -106,7 +106,7 @@ enum-name = "GPIO_BATT_PRES_ODL"; }; ec_gsc_packet_mode { - gpios = <&gpio8 3 GPIO_OUT_LOW>; + gpios = <&gpio8 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; pmic_resin_l { @@ -122,11 +122,11 @@ enum-name = "GPIO_EC_INT_L"; }; gpio_switchcap_on: switchcap_on { - gpios = <&gpio5 0 GPIO_OUT_LOW>; + gpios = <&gpio5 0 GPIO_OUTPUT_LOW>; enum-name = "GPIO_SWITCHCAP_ON"; }; gpio_en_pp5000_s5: en_pp5000_s5 { - gpios = <&gpio7 3 GPIO_OUT_HIGH>; + gpios = <&gpio7 3 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_EN_PP5000"; }; ec_bl_disable_l { @@ -142,48 +142,48 @@ gpios = <&gpioa 1 GPIO_INPUT>; }; tp_int_gate { - gpios = <&gpio7 4 GPIO_OUT_LOW>; + gpios = <&gpio7 4 GPIO_OUTPUT_LOW>; }; gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l { - gpios = <&gpiof 1 GPIO_OUT_HIGH>; + gpios = <&gpiof 1 GPIO_OUTPUT_HIGH>; }; gpio_usb_c1_pd_rst_l: usb_c1_pd_rst_l { - gpios = <&gpioe 4 GPIO_OUT_HIGH>; + gpios = <&gpioe 4 GPIO_OUTPUT_HIGH>; }; gpio_dp_mux_oe_l: dp_mux_oe_l { gpios = <&gpiob 1 GPIO_ODR_HIGH>; }; gpio_dp_mux_sel: dp_mux_sel { - gpios = <&gpio4 5 GPIO_OUT_LOW>; + gpios = <&gpio4 5 GPIO_OUTPUT_LOW>; }; gpio_dp_hot_plug_det_r: dp_hot_plug_det_r { - gpios = <&gpio9 5 GPIO_OUT_LOW>; + gpios = <&gpio9 5 GPIO_OUTPUT_LOW>; }; gpio_en_usb_a_5v: en_usb_a_5v { - gpios = <&gpiof 0 GPIO_OUT_LOW>; + gpios = <&gpiof 0 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_USB_A_5V"; }; usb_a_cdp_ilim_en_l { - gpios = <&gpio7 5 GPIO_OUT_HIGH>; + gpios = <&gpio7 5 GPIO_OUTPUT_HIGH>; }; usb_c0_frs_en { - gpios = <&gpioc 5 GPIO_OUT_LOW>; + gpios = <&gpioc 5 GPIO_OUTPUT_LOW>; }; usb_c1_frs_en { - gpios = <&gpioc 1 GPIO_OUT_LOW>; + gpios = <&gpioc 1 GPIO_OUTPUT_LOW>; enum-name = "GPIO_USB_C1_FRS_EN"; }; gpio_ec_chg_led_y_c0: ec_chg_led_y_c0 { - gpios = <&gpio6 0 GPIO_OUT_LOW>; + gpios = <&gpio6 0 GPIO_OUTPUT_LOW>; }; gpio_ec_chg_led_w_c0: ec_chg_led_w_c0 { - gpios = <&gpioc 0 GPIO_OUT_LOW>; + gpios = <&gpioc 0 GPIO_OUTPUT_LOW>; }; gpio_ec_chg_led_y_c1: ec_chg_led_y_c1 { - gpios = <&gpioc 3 GPIO_OUT_LOW>; + gpios = <&gpioc 3 GPIO_OUTPUT_LOW>; }; gpio_ec_chg_led_w_c1: ec_chg_led_w_c1 { - gpios = <&gpioc 4 GPIO_OUT_LOW>; + gpios = <&gpioc 4 GPIO_OUTPUT_LOW>; }; ap_ec_spi_mosi { gpios = <&gpio4 6 GPIO_INPUT_PULL_DOWN>; @@ -220,10 +220,10 @@ enum-name = "GPIO_SWITCHCAP_PG"; }; arm_x86 { - gpios = <&gpio6 6 GPIO_OUT_LOW>; + gpios = <&gpio6 6 GPIO_OUTPUT_LOW>; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; }; diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts index b9b8e6c923..a62a5b0333 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/gpio.dts @@ -110,7 +110,7 @@ enum-name = "GPIO_SYS_RESET_L"; }; pm-rsmrst-n { - gpios = <&gpiod 3 GPIO_OUT_LOW>; + gpios = <&gpiod 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_RSMRST_L"; }; pm-pwrbtn-n { @@ -118,10 +118,10 @@ enum-name = "GPIO_PCH_PWRBTN_L"; }; ec_spi_oe_mecc: ec-spi-oe-mecc { - gpios = <&gpio6 0 GPIO_OUT_LOW>; + gpios = <&gpio6 0 GPIO_OUTPUT_LOW>; }; ec-ds3 { - gpios = <&gpioc 4 GPIO_OUT_LOW>; + gpios = <&gpioc 4 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP3300_A"; }; pch-pwrok-ec { @@ -129,22 +129,22 @@ enum-name = "GPIO_PCH_PWROK"; }; sys-pwrok { - gpios = <&gpio9 3 GPIO_OUT_LOW>; + gpios = <&gpio9 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_SYS_PWROK"; }; ec-dsw-pwrok { - gpios = <&gpio9 5 GPIO_OUT_LOW>; + gpios = <&gpio9 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_DSW_PWROK"; }; gpio_wp: ec-flash-wp-odl { gpios = <&gpio9 4 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; }; ec-h1-packet-mode { - gpios = <&gpioe 2 GPIO_OUT_LOW>; + gpios = <&gpioe 2 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; ec-entering-rw { - gpios = <&gpiod 4 GPIO_OUT_LOW>; + gpios = <&gpiod 4 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; ccd-mode-odl { @@ -155,16 +155,16 @@ enum-name = "GPIO_BATT_PRES_ODL"; }; edp-bklt-en-mecc { - gpios = <&gpioe 1 GPIO_OUT_HIGH>; + gpios = <&gpioe 1 GPIO_OUTPUT_HIGH>; }; led-1-l { - gpios = <&gpiob 6 GPIO_OUT_HIGH>; + gpios = <&gpiob 6 GPIO_OUTPUT_HIGH>; }; led-2-l { - gpios = <&gpiob 7 GPIO_OUT_HIGH>; + gpios = <&gpiob 7 GPIO_OUTPUT_HIGH>; }; therm-sen-mecc { - gpios = <&gpioc 0 GPIO_OUT_LOW>; + gpios = <&gpioc 0 GPIO_OUTPUT_LOW>; }; smb-bs-clk { gpios = <&gpiob 3 GPIO_INPUT>; @@ -272,7 +272,7 @@ gpios = <&gpioe 0 GPIO_INPUT>; }; gpio_ec_kso_02_inv: ec-kso-02-inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; }; }; diff --git a/zephyr/projects/intelrvp/adlrvp/ioex.dts b/zephyr/projects/intelrvp/adlrvp/ioex.dts index 00bd3696f3..1fd1904c46 100644 --- a/zephyr/projects/intelrvp/adlrvp/ioex.dts +++ b/zephyr/projects/intelrvp/adlrvp/ioex.dts @@ -8,77 +8,77 @@ compatible = "named-ioexes"; usb-c0-bb-retimer-rst { - gpios = <&ioex_c0_port 0 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port 0 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_BB_RETIMER_RST"; label = "USB_C0_BB_RETIMER_RST"; }; usb-c0-bb-retimer-ls-en { - gpios = <&ioex_c0_port 1 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port 1 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_BB_RETIMER_LS_EN"; label = "USB_C0_BB_RETIMER_LS_EN"; }; usb-c0-usb-mux-cntrl-1 { - gpios = <&ioex_c0_port 4 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port 4 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_USB_MUX_CNTRL_1"; label = "USB_C0_USB_MUX_CNTRL_1"; }; usb-c0-usb-mux-cntrl-0 { - gpios = <&ioex_c0_port 5 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port 5 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_USB_MUX_CNTRL_0"; label = "USB_C0_USB_MUX_CNTRL_0"; }; usb-c1-bb-retimer-rst { - gpios = <&ioex_c1_port 0 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port 0 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_BB_RETIMER_RST"; label = "USB_C1_BB_RETIMER_RST"; }; usb-c1-bb-retimer-ls-en { - gpios = <&ioex_c1_port 1 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port 1 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_BB_RETIMER_LS_EN"; label = "USB_C1_BB_RETIMER_LS_EN"; }; usb-c1-hpd { - gpios = <&ioex_c1_port 2 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port 2 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_HPD"; label = "USB_C1_HPD"; }; usb-c0-c1-oc { - gpios = <&ioex_c1_port 8 GPIO_OUT_HIGH>; + gpios = <&ioex_c1_port 8 GPIO_OUTPUT_HIGH>; enum-name = "IOEX_USB_C0_C1_OC"; label = "USB_C0_C1_OC"; }; usb-c2-bb-retimer-rst { - gpios = <&ioex_c2_port 0 GPIO_OUT_LOW>; + gpios = <&ioex_c2_port 0 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C2_BB_RETIMER_RST"; label = "USB_C2_BB_RETIMER_RST"; }; usb-c2-bb-retimer-ls-en { - gpios = <&ioex_c2_port 1 GPIO_OUT_LOW>; + gpios = <&ioex_c2_port 1 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C2_BB_RETIMER_LS_EN"; label = "USB_C2_BB_RETIMER_LS_EN"; }; usb-c2-usb-mux-cntrl-1 { - gpios = <&ioex_c2_port 4 GPIO_OUT_LOW>; + gpios = <&ioex_c2_port 4 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C2_USB_MUX_CNTRL_1"; label = "USB_C2_USB_MUX_CNTRL_1"; }; usb-c2-usb-mux-cntrl-0 { - gpios = <&ioex_c2_port 5 GPIO_OUT_LOW>; + gpios = <&ioex_c2_port 5 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C2_USB_MUX_CNTRL_0"; label = "USB_C2_USB_MUX_CNTRL_0"; }; usb-c3-bb-retimer-rst { - gpios = <&ioex_c3_port 0 GPIO_OUT_LOW>; + gpios = <&ioex_c3_port 0 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C3_BB_RETIMER_RST"; label = "USB_C3_BB_RETIMER_RST"; }; usb-c3-bb-retimer-ls-en { - gpios = <&ioex_c3_port 1 GPIO_OUT_LOW>; + gpios = <&ioex_c3_port 1 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C3_BB_RETIMER_LS_EN"; label = "USB_C3_BB_RETIMER_LS_EN"; }; usb-c2-c3-oc { - gpios = <&ioex_c3_port 8 GPIO_OUT_HIGH>; + gpios = <&ioex_c3_port 8 GPIO_OUTPUT_HIGH>; enum-name = "IOEX_USB_C2_C3_OC"; label = "USB_C2_C3_OC"; }; diff --git a/zephyr/projects/nissa/nivviks_generated.dts b/zephyr/projects/nissa/nivviks_generated.dts index 725e615403..a67062eb36 100644 --- a/zephyr/projects/nissa/nivviks_generated.dts +++ b/zephyr/projects/nissa/nivviks_generated.dts @@ -68,7 +68,7 @@ enum-name = "GPIO_PACKET_MODE_EN"; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; gpio_ec_pch_wake_odl: ec_pch_wake_odl { gpios = <&gpiob 0 GPIO_ODR_LOW>; diff --git a/zephyr/projects/npcx_evb/npcx7/gpio.dts b/zephyr/projects/npcx_evb/npcx7/gpio.dts index 34b453e892..d0aa642673 100644 --- a/zephyr/projects/npcx_evb/npcx7/gpio.dts +++ b/zephyr/projects/npcx_evb/npcx7/gpio.dts @@ -31,17 +31,17 @@ enum-name = "GPIO_LID_OPEN"; }; entering_rw { - gpios = <&gpio3 6 GPIO_OUT_LOW>; + gpios = <&gpio3 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; gpio_ec_pch_wake_odl: pch_wake_l { - gpios = <&gpio5 0 GPIO_OUT_HIGH>; + gpios = <&gpio5 0 GPIO_OUTPUT_HIGH>; }; gpio_pgood_fan: pgood_fan { gpios = <&gpioc 7 GPIO_INPUT_PULL_UP>; }; spi_cs_l { - gpios = <&gpioa 5 GPIO_OUT_HIGH>; + gpios = <&gpioa 5 GPIO_OUTPUT_HIGH>; }; board_version1 { gpios = <&gpio6 4 GPIO_INPUT>; diff --git a/zephyr/projects/npcx_evb/npcx9/gpio.dts b/zephyr/projects/npcx_evb/npcx9/gpio.dts index 34b453e892..d0aa642673 100644 --- a/zephyr/projects/npcx_evb/npcx9/gpio.dts +++ b/zephyr/projects/npcx_evb/npcx9/gpio.dts @@ -31,17 +31,17 @@ enum-name = "GPIO_LID_OPEN"; }; entering_rw { - gpios = <&gpio3 6 GPIO_OUT_LOW>; + gpios = <&gpio3 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; gpio_ec_pch_wake_odl: pch_wake_l { - gpios = <&gpio5 0 GPIO_OUT_HIGH>; + gpios = <&gpio5 0 GPIO_OUTPUT_HIGH>; }; gpio_pgood_fan: pgood_fan { gpios = <&gpioc 7 GPIO_INPUT_PULL_UP>; }; spi_cs_l { - gpios = <&gpioa 5 GPIO_OUT_HIGH>; + gpios = <&gpioa 5 GPIO_OUTPUT_HIGH>; }; board_version1 { gpios = <&gpio6 4 GPIO_INPUT>; diff --git a/zephyr/projects/skyrim/gpio.dts b/zephyr/projects/skyrim/gpio.dts index 39c123a071..d173b3ea07 100644 --- a/zephyr/projects/skyrim/gpio.dts +++ b/zephyr/projects/skyrim/gpio.dts @@ -12,7 +12,7 @@ gpios = <&gpioc 6 GPIO_ODR_HIGH>; }; ec_gsc_packet_mode { - gpios = <&gpiob 1 GPIO_OUT_LOW>; + gpios = <&gpiob 1 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; gpio_mech_pwr_btn_odl: mech_pwr_btn_odl { @@ -40,25 +40,25 @@ enum-name = "GPIO_AC_PRESENT"; }; en_pwr_s5 { - gpios = <&gpiob 7 GPIO_OUT_LOW>; + gpios = <&gpiob 7 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PWR_A"; }; gpio_en_pwr_s0_r: en_pwr_s0_r { - gpios = <&gpiof 1 GPIO_OUT_LOW>; + gpios = <&gpiof 1 GPIO_OUTPUT_LOW>; }; gpio_en_pwr_pcore_s0_r: en_pwr_pcore_s0_r { - gpios = <&gpioe 1 GPIO_OUT_LOW>; + gpios = <&gpioe 1 GPIO_OUTPUT_LOW>; }; ec_sys_rst_l { gpios = <&gpio7 6 GPIO_ODR_HIGH>; enum-name = "GPIO_SYS_RESET_L"; }; gpio_ec_soc_rsmrst_l: ec_soc_rsmrst_l { - gpios = <&gpioc 5 GPIO_OUT_LOW>; + gpios = <&gpioc 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_RSMRST_L"; }; gpio_ec_pch_wake_odl: ec_soc_wake_l { - gpios = <&gpio0 3 GPIO_OUT_HIGH>; + gpios = <&gpio0 3 GPIO_OUTPUT_HIGH>; }; prochot_odl { gpios = <&gpiod 5 GPIO_ODR_HIGH>; @@ -92,19 +92,19 @@ enum-name = "GPIO_USB_C1_BC12_INT_ODL"; }; gpio_usb_c0_tcpc_rst_l: usb_c0_tcpc_rst_l { - gpios = <&gpio3 4 GPIO_OUT_HIGH>; + gpios = <&gpio3 4 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_USB_C0_TCPC_RST_L"; }; gpio_usb_c1_tcpc_rst_l: usb_c1_tcpc_rst_l { - gpios = <&gpio3 7 GPIO_OUT_HIGH>; + gpios = <&gpio3 7 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_USB_C1_TCPC_RST_L"; }; usb_c0_hpd { - gpios = <&gpiof 5 GPIO_OUT_LOW>; + gpios = <&gpiof 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_USB_C0_DP_HPD"; }; usb_c1_hpd { - gpios = <&gpiof 4 GPIO_OUT_LOW>; + gpios = <&gpiof 4 GPIO_OUTPUT_LOW>; enum-name = "GPIO_USB_C1_DP_HPD"; }; gpio_lid_open: lid_open { @@ -116,7 +116,7 @@ enum-name = "GPIO_BATT_PRES_ODL"; }; gpio_ec_disable_disp_bl: ec_disable_disp_bl { - gpios = <&gpioa 6 GPIO_OUT_HIGH>; + gpios = <&gpioa 6 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_ENABLE_BACKLIGHT_L"; }; ec_i2c_usb_a0_c0_scl { @@ -168,11 +168,11 @@ gpios = <&gpiob 2 GPIO_INPUT>; }; en_kb_bl { - gpios = <&gpio9 7 GPIO_OUT_HIGH>; + gpios = <&gpio9 7 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_EN_KEYBOARD_BACKLIGHT"; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; tablet_mode { gpios = <&gpioc 1 GPIO_INPUT>; @@ -201,17 +201,17 @@ compatible = "named-ioexes"; usb_c0_tcpc_fastsw_ctl_en { - gpios = <&ioex_c0_port0 4 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port0 4 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_TCPC_FASTSW_CTL_EN"; label = "IOEX_USB_C0_TCPC_FASTSW_CTL_EN"; }; usb_c0_ppc_en_l { - gpios = <&ioex_c0_port1 0 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port1 0 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_PPC_EN_L"; label = "IOEX_USB_C0_PPC_EN_L"; }; usb_c0_ppc_ilim_3a_en { - gpios = <&ioex_c0_port1 1 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port1 1 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_PPC_ILIM_3A_EN"; label = "IOEX_USB_C0_PPC_ILIM_3A_EN"; }; @@ -222,7 +222,7 @@ label = "IOEX_USB_C0_FAULT_ODL"; }; ioex_en_pp5500_usb_a0_vbus: en_pp5500_usb_a0_vbus { - gpios = <&ioex_c0_port1 5 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port1 5 GPIO_OUTPUT_LOW>; enum-name = "IOEX_EN_PP5000_USB_A0_VBUS"; label = "IOEX_EN_PP5000_USB_A0_VBUS"; }; @@ -233,38 +233,38 @@ label = "IOEX_USB3_A0_FAULT_L"; }; usb_c0_sbu_flip { - gpios = <&ioex_c0_port1 7 GPIO_OUT_LOW>; + gpios = <&ioex_c0_port1 7 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C0_SBU_FLIP"; label = "IOEX_USB_C0_SBU_FLIP"; }; usb_a1_retimer_en { - gpios = <&ioex_c1_port0 0 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port0 0 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_A1_RETIMER_EN"; label = "IOEX_USB_A1_RETIMER_EN"; }; usb_a1_retimer_rst { - gpios = <&ioex_c1_port0 1 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port0 1 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_A1_RETIMER_RST"; label = "IOEX_USB_A1_RETIMER_RST"; }; usb_c1_in_hpd { - gpios = <&ioex_c1_port0 3 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port0 3 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_HPD_IN_DB"; label = "IOEX_USB_C1_IN_HPD"; }; usb_c1_tcpc_fastsw_ctl_en { - gpios = <&ioex_c1_port0 4 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port0 4 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_TCPC_FASTSW_CTL_EN"; label = "IOEX_USB_C1_TCPC_FASTSW_CTL_EN"; }; usb_c1_ppc_en_l { - gpios = <&ioex_c1_port1 0 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port1 0 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_PPC_EN_L"; label = "IOEX_USB_C1_PPC_EN_L"; }; usb_c1_ppc_ilim_3a_en { - gpios = <&ioex_c1_port1 1 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port1 1 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_PPC_ILIM_3A_EN"; label = "IOEX_USB_C1_PPC_ILIM_3A_EN"; }; @@ -275,7 +275,7 @@ label = "IOEX_USB_C1_FAULT_ODL"; }; ioex_en_pp5500_usb_a1_vbus: en_pp5500_usb_a1_vbus { - gpios = <&ioex_c1_port1 5 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port1 5 GPIO_OUTPUT_LOW>; enum-name = "IOEX_EN_PP5000_USB_A1_VBUS_DB"; label = "IOEX_EN_PP5000_USB_A1_VBUS"; }; @@ -286,7 +286,7 @@ label = "IOEX_USB_A1_FAULT_DB_ODL"; }; usb_c1_sbu_flip { - gpios = <&ioex_c1_port1 7 GPIO_OUT_LOW>; + gpios = <&ioex_c1_port1 7 GPIO_OUTPUT_LOW>; enum-name = "IOEX_USB_C1_SBU_FLIP"; label = "IOEX_USB_C1_SBU_FLIP"; }; diff --git a/zephyr/projects/skyrim/guybrush.dts b/zephyr/projects/skyrim/guybrush.dts index 0286bc6f1f..d3e1d95832 100644 --- a/zephyr/projects/skyrim/guybrush.dts +++ b/zephyr/projects/skyrim/guybrush.dts @@ -31,25 +31,25 @@ gpios = <&gpio9 5 GPIO_INPUT>; }; ec_soc_pwr_good { - gpios = <&gpiod 3 GPIO_OUT_LOW>; + gpios = <&gpiod 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_SYS_PWROK"; }; ec_entering_rw { - gpios = <&gpio6 6 GPIO_OUT_LOW>; + gpios = <&gpio6 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; ec_clr_cmos { - gpios = <&gpioa 1 GPIO_OUT_LOW>; + gpios = <&gpioa 1 GPIO_OUTPUT_LOW>; }; ec_mem_event { - gpios = <&gpioa 5 GPIO_OUT_LOW>; + gpios = <&gpioa 5 GPIO_OUTPUT_LOW>; }; gpio_ec_soc_pwr_btn_l: ec_soc_pwr_btn_l { - gpios = <&gpio6 3 GPIO_OUT_HIGH>; + gpios = <&gpio6 3 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_PCH_PWRBTN_L"; }; ec_soc_int_l { - gpios = <&gpio8 3 GPIO_OUT_HIGH>; + gpios = <&gpio8 3 GPIO_OUTPUT_HIGH>; }; soc_thermtrip_odl { gpios = <&gpioe 5 GPIO_INPUT>; diff --git a/zephyr/projects/skyrim/skyrim.dts b/zephyr/projects/skyrim/skyrim.dts index 4bf65ffc74..7f20c5e266 100644 --- a/zephyr/projects/skyrim/skyrim.dts +++ b/zephyr/projects/skyrim/skyrim.dts @@ -16,7 +16,7 @@ gpios = <&gpio5 0 GPIO_ODR_HIGH>; }; gpio_en_pwr_s3: en_pwr_s3 { - gpios = <&gpio7 4 GPIO_OUT_LOW>; + gpios = <&gpio7 4 GPIO_OUTPUT_LOW>; }; gpio_pg_groupc_s0_od: pg_groupc_s0_od { gpios = <&gpiof 0 GPIO_INPUT>; @@ -30,14 +30,14 @@ gpios = <&gpio9 5 GPIO_INPUT>; }; hub_rst { - gpios = <&gpio6 6 GPIO_OUT_LOW>; + gpios = <&gpio6 6 GPIO_OUTPUT_LOW>; }; ec_soc_int_l { - gpios = <&gpioa 1 GPIO_OUT_HIGH>; + gpios = <&gpioa 1 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_EC_INT_L"; }; gpio_ec_soc_pwr_good: ec_soc_pwr_good { - gpios = <&gpiod 3 GPIO_OUT_LOW>; + gpios = <&gpiod 3 GPIO_OUTPUT_LOW>; }; /* TODO: Add interrupt handler to shut down */ pcore_ocp_r_l { @@ -58,7 +58,7 @@ gpios = <&gpioa 2 GPIO_INPUT_PULL_UP>; }; gpio_ec_soc_pwr_btn_l: ec_soc_pwr_btn_l { - gpios = <&gpioa 7 GPIO_OUT_HIGH>; + gpios = <&gpioa 7 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_PCH_PWRBTN_L"; }; gpio_volup_btn_odl: volup_btn_odl { @@ -70,10 +70,10 @@ enum-name = "GPIO_VOLUME_DOWN_L"; }; ec_sc_rst { - gpios = <&gpiob 0 GPIO_OUT_LOW>; + gpios = <&gpiob 0 GPIO_OUTPUT_LOW>; }; gpio_cbi_wp: ec_cbi_wp { - gpios = <&gpio8 1 GPIO_OUT_LOW>; + gpios = <&gpio8 1 GPIO_OUTPUT_LOW>; }; gpio_wp: ec_wp_l { gpios = <&gpiod 7 (GPIO_INPUT | GPIO_ACTIVE_LOW)>; diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts index 80cbbfddd6..bb3cc1ee24 100644 --- a/zephyr/projects/trogdor/lazor/gpio.dts +++ b/zephyr/projects/trogdor/lazor/gpio.dts @@ -114,7 +114,7 @@ gpios = <&gpio0 2 GPIO_INPUT>; }; ec_entering_rw { - gpios = <&gpioe 1 GPIO_OUT_LOW>; + gpios = <&gpioe 1 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; ec_batt_pres_odl { @@ -134,36 +134,36 @@ enum-name = "GPIO_EC_INT_L"; }; qsip_on { - gpios = <&gpio5 0 GPIO_OUT_LOW>; + gpios = <&gpio5 0 GPIO_OUTPUT_LOW>; }; gpio_hibernate_l: hibernate_l { - gpios = <&gpio5 2 GPIO_OUT_HIGH>; + gpios = <&gpio5 2 GPIO_OUTPUT_HIGH>; }; gpio_switchcap_on: switchcap_on { - gpios = <&gpiod 5 GPIO_OUT_LOW>; + gpios = <&gpiod 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_SWITCHCAP_ON"; }; gpio_vbob_en: vbob_en { - gpios = <&gpiod 3 GPIO_OUT_LOW>; + gpios = <&gpiod 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_VBOB_EN"; }; gpio_en_pp3300_a: en_pp3300_a { - gpios = <&gpioa 6 GPIO_OUT_LOW>; + gpios = <&gpioa 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP3300_A"; }; gpio_en_pp5000_a: en_pp5000_a { - gpios = <&gpio6 7 GPIO_OUT_LOW>; + gpios = <&gpio6 7 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000"; }; ec_bl_disable_l { - gpios = <&gpiob 6 GPIO_OUT_LOW>; + gpios = <&gpiob 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENABLE_BACKLIGHT"; }; gpio_lid_accel_int_l: lid_accel_int_l { gpios = <&gpio5 6 GPIO_INPUT>; }; trackpad_int_gate { - gpios = <&gpio7 4 GPIO_OUT_LOW>; + gpios = <&gpio7 4 GPIO_OUTPUT_LOW>; }; gpio_usb_c0_pd_rst_l: usb_c0_pd_rst_l { gpios = <&gpiof 1 GPIO_ODR_HIGH>; @@ -175,23 +175,23 @@ gpios = <&gpio9 6 GPIO_ODR_HIGH>; }; gpio_dp_mux_sel: dp_mux_sel { - gpios = <&gpio4 5 GPIO_OUT_LOW>; + gpios = <&gpio4 5 GPIO_OUTPUT_LOW>; }; gpio_dp_hot_plug_det: dp_hot_plug_det { - gpios = <&gpio9 5 GPIO_OUT_LOW>; + gpios = <&gpio9 5 GPIO_OUTPUT_LOW>; }; en_usb_a_5v { - gpios = <&gpio8 6 GPIO_OUT_LOW>; + gpios = <&gpio8 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_USB_A_5V"; }; usb_a_cdp_ilim_en { - gpios = <&gpio7 5 GPIO_OUT_HIGH>; + gpios = <&gpio7 5 GPIO_OUTPUT_HIGH>; }; gpio_ec_chg_led_y_c1: ec_chg_led_y_c1 { - gpios = <&gpioc 3 GPIO_OUT_LOW>; + gpios = <&gpioc 3 GPIO_OUTPUT_LOW>; }; gpio_ec_chg_led_b_c1: ec_chg_led_b_c1 { - gpios = <&gpioc 4 GPIO_OUT_LOW>; + gpios = <&gpioc 4 GPIO_OUTPUT_LOW>; }; gpio_brd_id0: brd_id0 { gpios = <&gpioc 7 GPIO_INPUT>; @@ -215,10 +215,10 @@ gpios = <&gpiod 4 GPIO_INPUT>; }; arm_x86 { - gpios = <&gpio6 6 GPIO_OUT_LOW>; + gpios = <&gpio6 6 GPIO_OUTPUT_LOW>; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; }; diff --git a/zephyr/projects/volteer/volteer/gpio.dts b/zephyr/projects/volteer/volteer/gpio.dts index d17ecc21f2..e205927405 100644 --- a/zephyr/projects/volteer/volteer/gpio.dts +++ b/zephyr/projects/volteer/volteer/gpio.dts @@ -96,7 +96,7 @@ enum-name = "GPIO_USB_C1_BC12_INT_ODL"; }; usb_c1_frs_en { - gpios = <&gpio9 4 GPIO_OUT_LOW>; + gpios = <&gpio9 4 GPIO_OUTPUT_LOW>; enum-name = "GPIO_USB_C1_FRS_EN"; }; gpio_ec_voldn_btn_odl: ec_voldn_btn_odl { @@ -108,30 +108,30 @@ enum-name = "GPIO_VOLUME_UP_L"; }; en_pp3300_a { - gpios = <&gpioa 3 GPIO_OUT_LOW>; + gpios = <&gpioa 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP3300_A"; }; en_pp5000 { - gpios = <&gpioa 4 GPIO_OUT_LOW>; + gpios = <&gpioa 4 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000"; }; en_pp5000_a { - gpios = <&gpioa 4 GPIO_OUT_LOW>; + gpios = <&gpioa 4 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000_A"; }; en_ppvar_vccin { - gpios = <&gpio4 3 GPIO_OUT_LOW>; + gpios = <&gpio4 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PPVAR_VCCIN"; }; gpio_ec_pch_dsw_pwrok: ec_pch_dsw_pwrok { - gpios = <&gpioc 0 GPIO_OUT_LOW>; + gpios = <&gpioc 0 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_DSW_PWROK"; }; ec_rst_odl { gpios = <&gpio0 2 GPIO_INPUT>; }; ec_pch_sys_pwrok { - gpios = <&gpio3 7 GPIO_OUT_LOW>; + gpios = <&gpio3 7 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EC_PCH_SYS_PWROK"; }; ec_pch_rsmrst_odl { @@ -143,14 +143,14 @@ enum-name = "GPIO_PCH_PWRBTN_L"; }; ec_pch_rtcrst { - gpios = <&gpio7 6 GPIO_OUT_LOW>; + gpios = <&gpio7 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PCH_RTCRST"; }; gpio_ec_pch_wake_odl: ec_pch_wake_odl { gpios = <&gpio7 4 GPIO_ODR_HIGH>; }; ec_entering_rw { - gpios = <&gpioe 3 GPIO_OUT_LOW>; + gpios = <&gpioe 3 GPIO_OUTPUT_LOW>; enum-name = "GPIO_ENTERING_RW"; }; ec_prochot_odl { @@ -170,7 +170,7 @@ enum-name = "GPIO_EC_INT_L"; }; en_pp5000_usba { - gpios = <&gpioc 6 GPIO_OUT_LOW>; + gpios = <&gpioc 6 GPIO_OUTPUT_LOW>; enum-name = "GPIO_EN_PP5000_USBA"; }; usb_a_low_pwr_od { @@ -195,7 +195,7 @@ gpios = <&gpiof 3 GPIO_INPUT>; }; ec_h1_packet_mode { - gpios = <&gpio7 5 GPIO_OUT_LOW>; + gpios = <&gpio7 5 GPIO_OUTPUT_LOW>; enum-name = "GPIO_PACKET_MODE_EN"; }; m2_ssd_pln { @@ -221,7 +221,7 @@ gpios = <&gpio5 7 GPIO_INPUT_PULL_UP>; }; ec_edp_bl_en { - gpios = <&gpiod 3 GPIO_OUT_HIGH>; + gpios = <&gpiod 3 GPIO_OUTPUT_HIGH>; enum-name = "GPIO_ENABLE_BACKLIGHT"; }; ec_i2c0_sensor_scl { @@ -268,10 +268,10 @@ enum-name = "GPIO_BATT_PRES_ODL"; }; gpio_en_pp5000_fan: en_pp5000_fan { - gpios = <&gpio6 1 GPIO_OUT_LOW>; + gpios = <&gpio6 1 GPIO_OUTPUT_LOW>; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio1 7 (GPIO_OUT_LOW | GPIO_ACTIVE_LOW)>; + gpios = <&gpio1 7 (GPIO_OUTPUT_LOW | GPIO_ACTIVE_LOW)>; }; }; diff --git a/zephyr/test/ap_power/overlay.dts b/zephyr/test/ap_power/overlay.dts index 288038c26d..d961788c7a 100644 --- a/zephyr/test/ap_power/overlay.dts +++ b/zephyr/test/ap_power/overlay.dts @@ -33,7 +33,7 @@ enum-name = "GPIO_PCH_PWRBTN_L"; }; gpio_ec_pch_wake_odl: ec_pch_wake_odl { - gpios = <&gpio0 3 GPIO_OUT_HIGH>; + gpios = <&gpio0 3 GPIO_OUTPUT_HIGH>; }; gpio_lid_open_ec: lid_open_ec { /* GPIO_PULL_UP will cause this start asserted. */ diff --git a/zephyr/test/drivers/overlay.dts b/zephyr/test/drivers/overlay.dts index 71fce65322..8b512f2eec 100644 --- a/zephyr/test/drivers/overlay.dts +++ b/zephyr/test/drivers/overlay.dts @@ -45,14 +45,14 @@ GPIO_ACTIVE_LOW)>; }; gpio_ec_kso_02_inv: ec_kso_02_inv { - gpios = <&gpio0 4 (GPIO_INPUT | GPIO_OUT_LOW)>; + gpios = <&gpio0 4 (GPIO_INPUT | GPIO_OUTPUT_LOW)>; }; pg_ec_dsw_pwrok { gpios = <&gpio0 4 GPIO_INPUT>; enum-name = "GPIO_TEMP_SENSOR_POWER"; }; gpio_ec_pch_wake_odl: ec_pch_wake_odl { - gpios = <&gpio0 5 GPIO_OUT_HIGH>; + gpios = <&gpio0 5 GPIO_OUTPUT_HIGH>; }; /* Setup USB C1 pin as output to check their state in test */ usb_c1_ls_en: usb_c1_ls_en { @@ -63,7 +63,7 @@ gpios = <&gpio0 7 (GPIO_OUTPUT | GPIO_INPUT)>; }; gpio_usb_c1_frs_en: usb_c1_frs_en { - gpios = <&gpio0 8 (GPIO_OUT_LOW)>; + gpios = <&gpio0 8 (GPIO_OUTPUT_LOW)>; }; usb_c0_tcpc_int_odl: usb_c0_tcpc_int_odl { gpios = <&gpio0 9 GPIO_INPUT>; @@ -72,10 +72,10 @@ gpios = <&gpio0 10 GPIO_INPUT>; }; usb_c0_tcpc_rst_l: usb_c0_tcpc_rst_l { - gpios = <&gpio0 11 (GPIO_OUT_HIGH | GPIO_INPUT)>; + gpios = <&gpio0 11 (GPIO_OUTPUT_HIGH | GPIO_INPUT)>; }; usb_c1_tcpc_rst_l: usb_c1_tcpc_rst_l { - gpios = <&gpio0 12 (GPIO_OUT_HIGH | GPIO_INPUT)>; + gpios = <&gpio0 12 (GPIO_OUTPUT_HIGH | GPIO_INPUT)>; }; gpio_usb_c1_ppc_int: usb_c1_ppc_int { gpios = <&gpio0 13 GPIO_INPUT>; @@ -121,7 +121,7 @@ enum-name = "GPIO_LID_OPEN"; }; gpio_switchcap_on: switchcap_on { - gpios = <&gpio0 24 (GPIO_INPUT | GPIO_OUT_LOW)>; + gpios = <&gpio0 24 (GPIO_INPUT | GPIO_OUTPUT_LOW)>; }; gpio_ec_pwr_btn_odl: ec_pwr_btn_odl { /* GPIO_PULL_UP will cause this start asserted, |