zephyr: Rename irq-gpio to irq-pin

Avoid the need for #gpio-cells by renaming
irq-gpio to irq-pin

BUG=b:216402316
TEST=zmake testall
BRANCH=none

Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I3c489e7835c487e45ef86b838fab96f55336e061
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3419357
Reviewed-by: Denis Brockus <dbrockus@chromium.org>

22 files changed, 249 insertions, 243 deletions

diff --git a/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml b/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml
index 5b2120b79a..56cf17a5a1 100644
--- a/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml
+++ b/zephyr/dts/bindings/gpio/cros-ec,gpio-interrupts.yaml
@@ -8,7 +8,7 @@ description: |
   Uses device tree to configure the interrupt handling e.g
 
     int_wp_l: wp_l {
-      irq-gpio = <&gpio_ec_wp_odl>;
+      irq-pin = <&gpio_ec_wp_odl>;
       flags = <GPIO_INT_EDGE_BOTH>;
       handler = "wp_interrupt";
     };
@@ -26,10 +26,15 @@ compatible: "cros-ec,gpio-interrupts"
 child-binding:
   description: GPIO Interrupt definition.
   properties:
-    irq-gpio:
+    #
+    # This is named irq-pin rather than irq-gpio because
+    # anything with a name appended with "gpio" is treated specially,
+    # which causes warnings about missing #gpio-cells.
+    #
+    irq-pin:
       type: phandle
       required: true
-      description: The GPIO source of the interrupt.
+      description: The named-gpio GPIO source of the interrupt.
     flags:
       type: int
       required: true
diff --git a/zephyr/projects/asurada/hayato/interrupts.dts b/zephyr/projects/asurada/hayato/interrupts.dts
index bbeb0f7936..f10aae03c9 100644
--- a/zephyr/projects/asurada/hayato/interrupts.dts
+++ b/zephyr/projects/asurada/hayato/interrupts.dts
@@ -8,87 +8,87 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_power_button: power_button {
-			irq-gpio = <&power_button_l>;
+			irq-pin = <&power_button_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&lid_open>;
+			irq-pin = <&lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_base_imu_int_l: base_imu_int_l {
-			irq-gpio = <&gpio_accel_gyro_int_l>;
+			irq-pin = <&gpio_accel_gyro_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bmi160_interrupt";
 		};
 		int_lid_accel_int_l: lid_accel_int_l {
-			irq-gpio = <&gpio_lid_accel_int_l>;
+			irq-pin = <&gpio_lid_accel_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "lis2dw12_interrupt";
 		};
 		int_tablet_mode_l: tablet_mode_l {
-			irq-gpio = <&gpio_tablet_mode_l>;
+			irq-pin = <&gpio_tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
 		int_usb_c0_ppc_int_odl: usb_c0_ppc_int_odl {
-			irq-gpio = <&gpio_usb_c0_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c0_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12_int_odl: usb_c0_bc12_int_odl {
-			irq-gpio = <&gpio_usb_c0_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c0_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
 		int_usb_c1_bc12_int_l: usb_c1_bc12_int_l {
-			irq-gpio = <&gpio_usb_c1_bc12_int_l>;
+			irq-pin = <&gpio_usb_c1_bc12_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&ac_present>;
+			irq-pin = <&ac_present>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_x_ec_gpio2: x_ec_gpio2 {
-			irq-gpio = <&gpio_x_ec_gpio2>;
+			irq-pin = <&gpio_x_ec_gpio2>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "x_ec_interrupt";
 		};
 		int_ap_xhci_init_done: ap_xhci_init_done {
-			irq-gpio = <&gpio_ap_xhci_init_done>;
+			irq-pin = <&gpio_ap_xhci_init_done>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "usb_a0_interrupt";
 		};
 		int_ap_ec_watchdog_l: ap_ec_watchdog_l {
-			irq-gpio = <&ap_ec_watchdog_l>;
+			irq-pin = <&ap_ec_watchdog_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_watchdog_interrupt";
 		};
 		int_ap_in_sleep_l: ap_in_sleep_l {
-			irq-gpio = <&ap_in_sleep_l>;
+			irq-pin = <&ap_in_sleep_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pmic_ec_pwrgd: pmic_ec_pwrgd {
-			irq-gpio = <&pmic_ec_pwrgd>;
+			irq-pin = <&pmic_ec_pwrgd>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ap_ec_warm_rst_req: ap_ec_warm_rst_req {
-			irq-gpio = <&gpio_ap_ec_warm_rst_req>;
+			irq-pin = <&gpio_ap_ec_warm_rst_req>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_reset_request_interrupt";
 		};
 		int_ap_in_sleep_l: ap_in_sleep_l {
-			irq-gpio = <&ap_in_sleep_l>;
+			irq-pin = <&ap_in_sleep_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_spi0_cs: spi0_cs {
-			irq-gpio = <&gpio_spi0_cs>;
+			irq-pin = <&gpio_spi0_cs>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "spi_event";
 		};
diff --git a/zephyr/projects/brya/brya/cbi_eeprom.dts b/zephyr/projects/brya/brya/cbi_eeprom.dts
index f584c56afd..0eda6290f6 100644
--- a/zephyr/projects/brya/brya/cbi_eeprom.dts
+++ b/zephyr/projects/brya/brya/cbi_eeprom.dts
@@ -12,6 +12,7 @@
 		pagesize = <16>;
 		address-width = <8>;
 		timeout = <5>;
-		wp-gpios = <&gpio_ec_wp_l>;
+		/* Not used */
+		/* wp-gpios = <&gpio_ec_wp_l>; */
 	};
 };
diff --git a/zephyr/projects/brya/brya/interrupts.dts b/zephyr/projects/brya/brya/interrupts.dts
index ac2a3ee61d..07447778b8 100644
--- a/zephyr/projects/brya/brya/interrupts.dts
+++ b/zephyr/projects/brya/brya/interrupts.dts
@@ -8,137 +8,137 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_tablet_mode: tablet_mode {
-			irq-gpio = <&gpio_tablet_mode_l>;
+			irq-pin = <&gpio_tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&lid_open>;
+			irq-pin = <&lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gsc_ec_pwr_btn_odl>;
+			irq-pin = <&gsc_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_wp: wp {
-			irq-gpio = <&gpio_ec_wp_l>;
+			irq-pin = <&gpio_ec_wp_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&acok_od>;
+			irq-pin = <&acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&gpio_ec_volup_btn_odl>;
+			irq-pin = <&gpio_ec_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&gpio_ec_voldn_btn_odl>;
+			irq-pin = <&gpio_ec_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_accel: accel {
-			irq-gpio = <&gpio_ec_accel_int_l>;
+			irq-pin = <&gpio_ec_accel_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "lis2dw12_interrupt";
 		};
 		int_imu: imu {
-			irq-gpio = <&gpio_ec_imu_int_l>;
+			irq-pin = <&gpio_ec_imu_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "lsm6dso_interrupt";
 		};
 		int_slp_s0: slp_s0 {
-			irq-gpio = <&gpio_slp_s0_l>;
+			irq-pin = <&gpio_slp_s0_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_slp_s3: slp_s3 {
-			irq-gpio = <&gpio_slp_s3_l>;
+			irq-pin = <&gpio_slp_s3_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_slp_sus: slp_sus {
-			irq-gpio = <&gpio_slp_sus_l>;
+			irq-pin = <&gpio_slp_sus_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pg_dsw_pwrok: pg_dsw_pwrok {
-			irq-gpio = <&gpio_pg_ec_dsw_pwrok>;
+			irq-pin = <&gpio_pg_ec_dsw_pwrok>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pg_rsmrst_odl: pg_rsmrst_odl {
-			irq-gpio = <&gpio_pg_ec_rsmrst_odl>;
+			irq-pin = <&gpio_pg_ec_rsmrst_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pg_all_sys_pwrgd: pg_all_sys_pwrgd {
-			irq-gpio = <&gpio_pg_ec_all_sys_pwrgd>;
+			irq-pin = <&gpio_pg_ec_all_sys_pwrgd>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_als_rgb: als_rgb {
-			irq-gpio = <&gpio_ec_als_rgb_int_l>;
+			irq-pin = <&gpio_ec_als_rgb_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcs3400_interrupt";
 		};
 		int_prochot: prochot {
-			irq-gpio = <&gpio_ec_prochot_in_l>;
+			irq-pin = <&gpio_ec_prochot_in_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "throttle_ap_prochot_input_interrupt";
 		};
 		int_usb_c0_c2_tcpc: usb_c0_c2_tcpc {
-			irq-gpio = <&gpio_usb_c0_c2_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c0_c2_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1_tcpc: usb_c1_tcpc {
-			irq-gpio = <&gpio_usb_c1_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c1_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c0_ppc: usb_c0_ppc {
-			irq-gpio = <&gpio_usb_c0_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c0_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c1_ppc: usb_c1_ppc {
-			irq-gpio = <&gpio_usb_c1_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c1_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c2_ppc: usb_c2_ppc {
-			irq-gpio = <&gpio_usb_c2_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c2_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-gpio = <&gpio_usb_c0_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c0_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
 		int_usb_c1_bc12: usb_c1_bc12 {
-			irq-gpio = <&gpio_usb_c1_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c1_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
 		int_usb_c2_bc12: usb_c2_bc12 {
-			irq-gpio = <&gpio_usb_c2_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c2_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
 		int_usb_c0_rt: usb_c0_rt {
-			irq-gpio = <&usb_c0_rt_int_odl>;
+			irq-pin = <&usb_c0_rt_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "retimer_interrupt";
 		};
 		int_usb_c2_rt: usb_c2_rt {
-			irq-gpio = <&usb_c2_rt_int_odl>;
+			irq-pin = <&usb_c2_rt_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "retimer_interrupt";
 		};
diff --git a/zephyr/projects/corsola/interrupts_kingler.dts b/zephyr/projects/corsola/interrupts_kingler.dts
index a1f9a818a0..fecabc93f9 100644
--- a/zephyr/projects/corsola/interrupts_kingler.dts
+++ b/zephyr/projects/corsola/interrupts_kingler.dts
@@ -8,77 +8,77 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_power_button: power_button {
-			irq-gpio = <&gpio_gsc_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_gsc_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&gpio_ec_volup_btn_odl>;
+			irq-pin = <&gpio_ec_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&gpio_ec_voldn_btn_odl>;
+			irq-pin = <&gpio_ec_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open>;
+			irq-pin = <&gpio_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_warm_rst: warm_rst {
-			irq-gpio = <&ap_ec_warm_rst_req>;
+			irq-pin = <&ap_ec_warm_rst_req>;
 			flags = <GPIO_INT_EDGE_RISING>;
 			handler = "chipset_reset_request_interrupt";
 		};
 		int_ap_in_sleep: ap_in_sleep {
-			irq-gpio = <&ap_in_sleep_l>;
+			irq-pin = <&ap_in_sleep_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ap_in_rst: ap_in_rst {
-			irq-gpio = <&ap_sysrst_odl_r>;
+			irq-pin = <&ap_sysrst_odl_r>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ap_wdtrst: ap_wdtrst {
-			irq-gpio = <&ap_ec_wdtrst_l>;
+			irq-pin = <&ap_ec_wdtrst_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_acok_od>;
+			irq-pin = <&gpio_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_wp: wp {
-			irq-gpio = <&gpio_ec_wp_l>;
+			irq-pin = <&gpio_ec_wp_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_usb_c0_tcpc: usb_c0_tcpc {
-			irq-gpio = <&gpio_usb_c0_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c0_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1_tcpc: usb_c1_tcpc {
-			irq-gpio = <&gpio_usb_c1_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c1_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c0_ppc: usb_c0_ppc {
-			irq-gpio = <&gpio_usb_c0_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c0_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-gpio = <&gpio_usb_c0_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c0_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
 		int_x_ec_gpio2: x_ec_gpio2 {
-			irq-gpio = <&gpio_x_ec_gpio2>;
+			irq-pin = <&gpio_x_ec_gpio2>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "x_ec_interrupt";
 		};
diff --git a/zephyr/projects/corsola/interrupts_krabby.dts b/zephyr/projects/corsola/interrupts_krabby.dts
index e4b2ae1947..db61bbe41b 100644
--- a/zephyr/projects/corsola/interrupts_krabby.dts
+++ b/zephyr/projects/corsola/interrupts_krabby.dts
@@ -8,77 +8,77 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_power_button: power_button {
-			irq-gpio = <&power_button_l>;
+			irq-pin = <&power_button_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&volume_up_l>;
+			irq-pin = <&volume_up_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&volume_down_l>;
+			irq-pin = <&volume_down_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&lid_open>;
+			irq-pin = <&lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_warm_rst: warm_rst {
-			irq-gpio = <&ap_ec_warm_rst_req>;
+			irq-pin = <&ap_ec_warm_rst_req>;
 			flags = <GPIO_INT_EDGE_RISING>;
 			handler = "chipset_reset_request_interrupt";
 		};
 		int_ap_in_sleep: ap_in_sleep {
-			irq-gpio = <&ap_in_sleep_l>;
+			irq-pin = <&ap_in_sleep_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ap_in_rst: ap_in_rst {
-			irq-gpio = <&ap_sysrst_odl_r>;
+			irq-pin = <&ap_sysrst_odl_r>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ap_wdtrst: ap_wdtrst {
-			irq-gpio = <&ap_ec_wdtrst_l>;
+			irq-pin = <&ap_ec_wdtrst_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_tablet_mode: tablet_mode {
-			irq-gpio = <&tablet_mode_l>;
+			irq-pin = <&tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
 		int_base_imu: base_imu {
-			irq-gpio = <&base_imu_int_l>;
+			irq-pin = <&base_imu_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "icm42607_interrupt";
 		};
 		int_accel: accel {
-			irq-gpio = <&lid_accel_int_l>;
+			irq-pin = <&lid_accel_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "lis2dw12_interrupt";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&ac_present>;
+			irq-pin = <&ac_present>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_usba: usba {
-			irq-gpio = <&ap_xhci_init_done>;
+			irq-pin = <&ap_xhci_init_done>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "usb_a0_interrupt";
 		};
 		int_wp: wp {
-			irq-gpio = <&ec_flash_wp_odl>;
+			irq-pin = <&ec_flash_wp_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_spi0_cs: spi0_cs {
-			irq-gpio = <&spi0_cs>;
+			irq-pin = <&spi0_cs>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "spi_event";
 		};
diff --git a/zephyr/projects/herobrine/interrupts.dts b/zephyr/projects/herobrine/interrupts.dts
index a71d87d2f7..5e5ed06927 100644
--- a/zephyr/projects/herobrine/interrupts.dts
+++ b/zephyr/projects/herobrine/interrupts.dts
@@ -8,102 +8,102 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_chg_acok_od>;
+			irq-pin = <&gpio_chg_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open_ec>;
+			irq-pin = <&gpio_lid_open_ec>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_wp_l: wp_l {
-			irq-gpio = <&gpio_ec_wp_odl>;
+			irq-pin = <&gpio_ec_wp_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gpio_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&gpio_ec_volup_btn_odl>;
+			irq-pin = <&gpio_ec_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&gpio_ec_voldn_btn_odl>;
+			irq-pin = <&gpio_ec_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_ap_rst: ap_rst {
-			irq-gpio = <&gpio_ap_rst_l>;
+			irq-pin = <&gpio_ap_rst_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_ap_rst_interrupt";
 		};
 		int_ap_suspend: ap_suspend {
-			irq-gpio = <&gpio_ap_suspend>;
+			irq-pin = <&gpio_ap_suspend>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_power_good: power_good {
-			irq-gpio = <&gpio_mb_power_good>;
+			irq-pin = <&gpio_mb_power_good>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ps_hold: ps_hold {
-			irq-gpio = <&gpio_ps_hold>;
+			irq-pin = <&gpio_ps_hold>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_warm_reset: warm_reset {
-			irq-gpio = <&gpio_warm_reset_l>;
+			irq-pin = <&gpio_warm_reset_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_usb_c0_pd: usb_c0_pd {
-			irq-gpio = <&gpio_usb_c0_pd_int_odl>;
+			irq-pin = <&gpio_usb_c0_pd_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1_pd: usb_c1_pd {
-			irq-gpio = <&gpio_usb_c1_pd_int_odl>;
+			irq-pin = <&gpio_usb_c1_pd_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c0_swctl: usb_c0_swctl {
-			irq-gpio = <&gpio_usb_c0_swctl_int_odl>;
+			irq-pin = <&gpio_usb_c0_swctl_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c1_swctl: usb_c1_swctl {
-			irq-gpio = <&gpio_usb_c1_swctl_int_odl>;
+			irq-pin = <&gpio_usb_c1_swctl_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-gpio = <&gpio_usb_c0_bc12_int_l>;
+			irq-pin = <&gpio_usb_c0_bc12_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb0_evt";
 		};
 		int_usb_c1_bc12: usb_c1_bc12 {
-			irq-gpio = <&gpio_usb_c1_bc12_int_l>;
+			irq-pin = <&gpio_usb_c1_bc12_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb1_evt";
 		};
 		int_usb_a0_oc: usb_a0_oc {
-			irq-gpio = <&gpio_usb_a0_oc_odl>;
+			irq-pin = <&gpio_usb_a0_oc_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "usba_oc_interrupt";
 		};
 		int_accel_gyro: accel_gyro {
-			irq-gpio = <&gpio_accel_gyro_int_l>;
+			irq-pin = <&gpio_accel_gyro_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bmi260_interrupt";
 		};
 		int_tablet_mode: tablet_mode {
-			irq-gpio = <&gpio_tablet_mode_l>;
+			irq-pin = <&gpio_tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
diff --git a/zephyr/projects/it8xxx2_evb/interrupts.dts b/zephyr/projects/it8xxx2_evb/interrupts.dts
index a6ea98137c..d52a86ce43 100644
--- a/zephyr/projects/it8xxx2_evb/interrupts.dts
+++ b/zephyr/projects/it8xxx2_evb/interrupts.dts
@@ -8,17 +8,17 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_power_button: power_button {
-			irq-gpio = <&power_button_l>;
+			irq-pin = <&power_button_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&lid_open>;
+			irq-pin = <&lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_spi0_cs: spi0_cs {
-			irq-gpio = <&spi0_cs>;
+			irq-pin = <&spi0_cs>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "spi_event";
 		};
diff --git a/zephyr/projects/nissa/nereid_overlay.dts b/zephyr/projects/nissa/nereid_overlay.dts
index acd888b103..0623b81981 100644
--- a/zephyr/projects/nissa/nereid_overlay.dts
+++ b/zephyr/projects/nissa/nereid_overlay.dts
@@ -24,32 +24,32 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_power_button: power_button {
-			irq-gpio = <&gpio_gsc_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_gsc_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_wp_l: wp_l {
-			irq-gpio = <&gpio_ec_wp_odl>;
+			irq-pin = <&gpio_ec_wp_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open>;
+			irq-pin = <&gpio_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_usb_c0: usb_c0 {
-			irq-gpio = <&gpio_usb_c0_int_odl>;
+			irq-pin = <&gpio_usb_c0_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb_c0_interrupt";
 		};
 		int_usb_c1: usb_c1 {
-			irq-gpio = <&gpio_usb_c1_int_odl>;
+			irq-pin = <&gpio_usb_c1_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb_c1_interrupt";
 		};
 		int_prochot: ap_prochot {
-			irq-gpio = <&gpio_ec_prochot_odl>;
+			irq-pin = <&gpio_ec_prochot_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "throttle_ap_prochot_input_interrupt";
 		};
diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks_overlay.dts
index 4e6075d2bc..c10de438b7 100644
--- a/zephyr/projects/nissa/nivviks_overlay.dts
+++ b/zephyr/projects/nissa/nivviks_overlay.dts
@@ -24,47 +24,47 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_power_button: power_button {
-			irq-gpio = <&gpio_gsc_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_gsc_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_wp_l: wp_l {
-			irq-gpio = <&gpio_ec_wp_odl>;
+			irq-pin = <&gpio_ec_wp_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open>;
+			irq-pin = <&gpio_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_imu: ec_imu {
-			irq-gpio = <&gpio_imu_int_l>;
+			irq-pin = <&gpio_imu_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "lsm6dso_interrupt";
 		};
 		int_vol_down: vol_down {
-			irq-gpio = <&gpio_voldn_btn_odl>;
+			irq-pin = <&gpio_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_vol_up: vol_up {
-			irq-gpio = <&gpio_volup_btn_odl>;
+			irq-pin = <&gpio_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_usb_c0: usb_c0 {
-			irq-gpio = <&gpio_usb_c0_int_odl>;
+			irq-pin = <&gpio_usb_c0_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb_interrupt";
 		};
 		int_usb_c1: usb_c1 {
-			irq-gpio = <&gpio_usb_c1_int_odl>;
+			irq-pin = <&gpio_usb_c1_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb_interrupt";
 		};
 		int_prochot: ap_prochot {
-			irq-gpio = <&gpio_ec_prochot_odl>;
+			irq-pin = <&gpio_ec_prochot_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "throttle_ap_prochot_input_interrupt";
 		};
diff --git a/zephyr/projects/npcx_evb/npcx7/interrupts.dts b/zephyr/projects/npcx_evb/npcx7/interrupts.dts
index ee3fa90bd5..dfa4a321ef 100644
--- a/zephyr/projects/npcx_evb/npcx7/interrupts.dts
+++ b/zephyr/projects/npcx_evb/npcx7/interrupts.dts
@@ -8,17 +8,17 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_ac_present>;
+			irq-pin = <&gpio_ac_present>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open>;
+			irq-pin = <&gpio_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gpio_power_button_l>;
+			irq-pin = <&gpio_power_button_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
diff --git a/zephyr/projects/npcx_evb/npcx9/interrupts.dts b/zephyr/projects/npcx_evb/npcx9/interrupts.dts
index ee3fa90bd5..dfa4a321ef 100644
--- a/zephyr/projects/npcx_evb/npcx9/interrupts.dts
+++ b/zephyr/projects/npcx_evb/npcx9/interrupts.dts
@@ -8,17 +8,17 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_ac_present>;
+			irq-pin = <&gpio_ac_present>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open>;
+			irq-pin = <&gpio_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gpio_power_button_l>;
+			irq-pin = <&gpio_power_button_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
diff --git a/zephyr/projects/skyrim/guybrush.dts b/zephyr/projects/skyrim/guybrush.dts
index e2a47979e0..b5ca05644a 100644
--- a/zephyr/projects/skyrim/guybrush.dts
+++ b/zephyr/projects/skyrim/guybrush.dts
@@ -155,27 +155,27 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_pg_lpddr4x_s3: pg_lpddr4x_s3 {
-			irq-gpio = <&gpio_pg_lpddr4x_s3_od>;
+			irq-pin = <&gpio_pg_lpddr4x_s3_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_en_pwr_pcore_s0";
 		};
 		int_slp_s3_s0i3: slp_s3_s0i3 {
-			irq-gpio = <&gpio_slp_s3_s0i3_l>;
+			irq-pin = <&gpio_slp_s3_s0i3_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ec_pwr_btn: ec_pwr_btn {
-			irq-gpio = <&gpio_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ec_pcore: ec_pcore {
-			irq-gpio = <&gpio_ec_pcore_int_odl>;
+			irq-pin = <&gpio_ec_pcore_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pg_groupc_s0: pg_groupc_s0 {
-			irq-gpio = <&gpio_pg_groupc_s0_od>;
+			irq-pin = <&gpio_pg_groupc_s0_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_en_pwr_pcore_s0";
 		};
diff --git a/zephyr/projects/skyrim/interrupts.dts b/zephyr/projects/skyrim/interrupts.dts
index 64203c6a86..7121ac3272 100644
--- a/zephyr/projects/skyrim/interrupts.dts
+++ b/zephyr/projects/skyrim/interrupts.dts
@@ -8,82 +8,82 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open>;
+			irq-pin = <&gpio_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_acok_od>;
+			irq-pin = <&gpio_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gpio_mech_pwr_btn_odl>;
+			irq-pin = <&gpio_mech_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_slp_s3: slp_s3 {
-			irq-gpio = <&gpio_slp_s3_l>;
+			irq-pin = <&gpio_slp_s3_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_en_pwr_s0";
 		};
 		int_slp_s5: slp_s5 {
-			irq-gpio = <&gpio_slp_s5_l>;
+			irq-pin = <&gpio_slp_s5_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_s5_pgood: s5_pgood {
-			irq-gpio = <&gpio_pg_pwr_s5>;
+			irq-pin = <&gpio_pg_pwr_s5>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_en_pwr_s0";
 		};
 		int_s0_pgood: s0_pgood {
-			irq-gpio = <&gpio_s0_pgood>;
+			irq-pin = <&gpio_s0_pgood>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pg_groupc_s0: pg_groupc_s0 {
-			irq-gpio = <&gpio_pg_groupc_s0_od>;
+			irq-pin = <&gpio_pg_groupc_s0_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_set_en_pwr_pcore";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&gpio_volup_btn_odl>;
+			irq-pin = <&gpio_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&gpio_voldn_btn_odl>;
+			irq-pin = <&gpio_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_usb_c0_tcpc: usb_c0_tcpc {
-			irq-gpio = <&gpio_usb_c0_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c0_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1_tcpc: usb_c1_tcpc {
-			irq-gpio = <&gpio_usb_c1_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c1_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c0_ppc: usb_c0_ppc {
-			irq-gpio = <&gpio_usb_c0_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c0_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c1_ppc: usb_c1_ppc {
-			irq-gpio = <&gpio_usb_c1_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c1_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-gpio = <&gpio_usb_c0_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c0_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
 		int_usb_c1_bc12: usb_c1_bc12 {
-			irq-gpio = <&gpio_usb_c1_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c1_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bc12_interrupt";
 		};
diff --git a/zephyr/projects/skyrim/skyrim.dts b/zephyr/projects/skyrim/skyrim.dts
index ac548af3bf..28bdbc0588 100644
--- a/zephyr/projects/skyrim/skyrim.dts
+++ b/zephyr/projects/skyrim/skyrim.dts
@@ -135,12 +135,12 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_pg_lpddr_s3: pg_lpddr_s3 {
-			irq-gpio = <&gpio_pg_lpddr5_s3_od>;
+			irq-pin = <&gpio_pg_lpddr5_s3_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_set_en_pwr_pcore";
 		};
 		int_pg_lpddr_s0: pg_lpddr_s0 {
-			irq-gpio = <&gpio_pg_lpddr5_s0_od>;
+			irq-pin = <&gpio_pg_lpddr5_s0_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "baseboard_set_soc_pwr_pgood";
 		};
diff --git a/zephyr/projects/trogdor/lazor/interrupts.dts b/zephyr/projects/trogdor/lazor/interrupts.dts
index d7c55d25a7..8ba8f71078 100644
--- a/zephyr/projects/trogdor/lazor/interrupts.dts
+++ b/zephyr/projects/trogdor/lazor/interrupts.dts
@@ -8,117 +8,117 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_acok_od>;
+			irq-pin = <&gpio_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open_ec>;
+			irq-pin = <&gpio_lid_open_ec>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_wp: wp {
-			irq-gpio = <&gpio_ec_wp_odl>;
+			irq-pin = <&gpio_ec_wp_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gpio_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&gpio_ec_volup_btn_odl>;
+			irq-pin = <&gpio_ec_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&gpio_ec_voldn_btn_odl>;
+			irq-pin = <&gpio_ec_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_switchcap_pg: switchcap_pg {
-			irq-gpio = <&gpio_switchcap_pg_int_l>;
+			irq-pin = <&gpio_switchcap_pg_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ln9310_interrupt";
 		};
 		int_ap_rst: ap_rst {
-			irq-gpio = <&gpio_ap_rst_l>;
+			irq-pin = <&gpio_ap_rst_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_ap_rst_interrupt";
 		};
 		int_ap_suspend: ap_suspend {
-			irq-gpio = <&gpio_ap_suspend>;
+			irq-pin = <&gpio_ap_suspend>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_deprecated_ap_rst_req: deprecated_ap_rst_req {
-			irq-gpio = <&gpio_deprecated_ap_rst_req>;
+			irq-pin = <&gpio_deprecated_ap_rst_req>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_power_good: power_good {
-			irq-gpio = <&gpio_power_good>;
+			irq-pin = <&gpio_power_good>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_power_good_interrupt";
 		};
 		int_ps_hold: ps_hold {
-			irq-gpio = <&gpio_ps_hold>;
+			irq-pin = <&gpio_ps_hold>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_warm_reset: warm_reset {
-			irq-gpio = <&gpio_warm_reset_l>;
+			irq-pin = <&gpio_warm_reset_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_warm_reset_interrupt";
 		};
 		int_usb_c0_tcpc: usb_c0_tcpc {
-			irq-gpio = <&gpio_usb_c0_pd_int_odl>;
+			irq-pin = <&gpio_usb_c0_pd_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1_tcpc: usb_c1_tcpc {
-			irq-gpio = <&gpio_usb_c1_pd_int_odl>;
+			irq-pin = <&gpio_usb_c1_pd_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c0_swctl: usb_c0_swctl {
-			irq-gpio = <&gpio_usb_c0_swctl_int_odl>;
+			irq-pin = <&gpio_usb_c0_swctl_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c1_swctl: usb_c1_swctl {
-			irq-gpio = <&gpio_usb_c1_swctl_int_odl>;
+			irq-pin = <&gpio_usb_c1_swctl_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-gpio = <&gpio_usb_c0_bc12_int_l>;
+			irq-pin = <&gpio_usb_c0_bc12_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb0_evt";
 		};
 		int_usb_c1_bc12: usb_c1_bc12 {
-			irq-gpio = <&gpio_usb_c1_bc12_int_l>;
+			irq-pin = <&gpio_usb_c1_bc12_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb1_evt";
 		};
 		int_usb_a0_oc: usb_a0_oc {
-			irq-gpio = <&gpio_usb_a0_oc_odl>;
+			irq-pin = <&gpio_usb_a0_oc_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "usba_oc_interrupt";
 		};
 		int_ccd_mode: ccd_mode {
-			irq-gpio = <&gpio_ccd_mode_odl>;
+			irq-pin = <&gpio_ccd_mode_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "board_connect_c0_sbu";
 		};
 		int_accel: accel {
-			irq-gpio = <&gpio_accel_gyro_int_l>;
+			irq-pin = <&gpio_accel_gyro_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bmi160_interrupt";
 		};
 		int_tablet_mode: tablet_mode {
-			irq-gpio = <&gpio_tablet_mode_l>;
+			irq-pin = <&gpio_tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
diff --git a/zephyr/projects/trogdor/trogdor/interrupts.dts b/zephyr/projects/trogdor/trogdor/interrupts.dts
index bc711d10cc..d3514770a3 100644
--- a/zephyr/projects/trogdor/trogdor/interrupts.dts
+++ b/zephyr/projects/trogdor/trogdor/interrupts.dts
@@ -8,107 +8,107 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_chg_acok_od>;
+			irq-pin = <&gpio_chg_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_lid_open_ec>;
+			irq-pin = <&gpio_lid_open_ec>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_wp: wp {
-			irq-gpio = <&gpio_ec_wp_odl>;
+			irq-pin = <&gpio_ec_wp_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gpio_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&gpio_ec_volup_btn_odl>;
+			irq-pin = <&gpio_ec_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&gpio_ec_voldn_btn_odl>;
+			irq-pin = <&gpio_ec_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_ap_rst: ap_rst {
-			irq-gpio = <&gpio_ap_rst_l>;
+			irq-pin = <&gpio_ap_rst_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_ap_rst_interrupt";
 		};
 		int_ap_suspend: ap_suspend {
-			irq-gpio = <&gpio_ap_suspend>;
+			irq-pin = <&gpio_ap_suspend>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_deprecated_ap_rst_req: deprecated_ap_rst_req {
-			irq-gpio = <&gpio_deprecated_ap_rst_req>;
+			irq-pin = <&gpio_deprecated_ap_rst_req>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_power_good: power_good {
-			irq-gpio = <&gpio_power_good>;
+			irq-pin = <&gpio_power_good>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_power_good_interrupt";
 		};
 		int_ps_hold: ps_hold {
-			irq-gpio = <&gpio_ps_hold>;
+			irq-pin = <&gpio_ps_hold>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_warm_reset: warm_reset {
-			irq-gpio = <&gpio_warm_reset_l>;
+			irq-pin = <&gpio_warm_reset_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "chipset_warm_reset_interrupt";
 		};
 		int_usb_c0_tcpc: usb_c0_tcpc {
-			irq-gpio = <&gpio_usb_c0_pd_int_odl>;
+			irq-pin = <&gpio_usb_c0_pd_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1_tcpc: usb_c1_tcpc {
-			irq-gpio = <&gpio_usb_c1_pd_int_odl>;
+			irq-pin = <&gpio_usb_c1_pd_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c0_swctl: usb_c0_swctl {
-			irq-gpio = <&gpio_usb_c0_swctl_int_odl>;
+			irq-pin = <&gpio_usb_c0_swctl_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c1_swctl: usb_c1_swctl {
-			irq-gpio = <&gpio_usb_c1_swctl_int_odl>;
+			irq-pin = <&gpio_usb_c1_swctl_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-gpio = <&gpio_usb_c0_bc12_int_l>;
+			irq-pin = <&gpio_usb_c0_bc12_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb0_evt";
 		};
 		int_usb_c1_bc12: usb_c1_bc12 {
-			irq-gpio = <&gpio_usb_c1_bc12_int_l>;
+			irq-pin = <&gpio_usb_c1_bc12_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "usb1_evt";
 		};
 		int_usb_a0_oc: usb_a0_oc {
-			irq-gpio = <&gpio_usb_a0_oc_odl>;
+			irq-pin = <&gpio_usb_a0_oc_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "usba_oc_interrupt";
 		};
 		int_accel: accel {
-			irq-gpio = <&gpio_accel_gyro_int_l>;
+			irq-pin = <&gpio_accel_gyro_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bmi160_interrupt";
 		};
 		int_tablet_mode: tablet_mode {
-			irq-gpio = <&gpio_tablet_mode_l>;
+			irq-pin = <&gpio_tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
diff --git a/zephyr/projects/volteer/delbin/interrupts.dts b/zephyr/projects/volteer/delbin/interrupts.dts
index c4927f4edb..41922f56a7 100644
--- a/zephyr/projects/volteer/delbin/interrupts.dts
+++ b/zephyr/projects/volteer/delbin/interrupts.dts
@@ -8,67 +8,67 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_imu: imu {
-			irq-gpio = <&gpio_ec_imu_int_l>;
+			irq-pin = <&gpio_ec_imu_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bmi260_interrupt";
 		};
 		int_tablet_mode: tablet_mode {
-			irq-gpio = <&gpio_tablet_mode_l>;
+			irq-pin = <&gpio_tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_acok_od>;
+			irq-pin = <&gpio_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_ec_lid_open>;
+			irq-pin = <&gpio_ec_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_power_button: power_button {
-			irq-gpio = <&gpio_h1_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_h1_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_button_interrupt";
 		};
 		int_wp: wp {
-			irq-gpio = <&gpio_ec_wp_l>;
+			irq-pin = <&gpio_ec_wp_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_pch_slp_s0: pch_slp_s0 {
-			irq-gpio = <&gpio_slp_s0_l>;
+			irq-pin = <&gpio_slp_s0_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pch_slp_s3: pch_slp_s3 {
-			irq-gpio = <&gpio_slp_s3_l>;
+			irq-pin = <&gpio_slp_s3_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_dsw_pwrok: dsw_pwrok {
-			irq-gpio = <&gpio_dsw_pwrok>;
+			irq-pin = <&gpio_dsw_pwrok>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_rsmrst: rsmrst {
-			irq-gpio = <&gpio_pg_ec_rsmrst_odl>;
+			irq-pin = <&gpio_pg_ec_rsmrst_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_all_sys_pwrgd: all_sys_pwrgd {
-			irq-gpio = <&gpio_pg_ec_all_sys_pwrgd>;
+			irq-pin = <&gpio_pg_ec_all_sys_pwrgd>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_slp_sus: slp_sus {
-			irq-gpio = <&gpio_slp_sus_l>;
+			irq-pin = <&gpio_slp_sus_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_prochot_in: prochot_in {
-			irq-gpio = <&gpio_ec_prochot_in_l>;
+			irq-pin = <&gpio_ec_prochot_in_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "throttle_ap_prochot_input_interrupt";
 		};
diff --git a/zephyr/projects/volteer/volteer/interrupts.dts b/zephyr/projects/volteer/volteer/interrupts.dts
index 3e8458a8f7..fecbb90317 100644
--- a/zephyr/projects/volteer/volteer/interrupts.dts
+++ b/zephyr/projects/volteer/volteer/interrupts.dts
@@ -8,122 +8,122 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_imu: imu {
-			irq-gpio = <&gpio_ec_imu_int_l>;
+			irq-pin = <&gpio_ec_imu_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "bmi260_interrupt";
 		};
 		int_tablet_mode: tablet_mode {
-			irq-gpio = <&gpio_tablet_mode_l>;
+			irq-pin = <&gpio_tablet_mode_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "gmr_tablet_switch_isr";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&XG>;
+			irq-pin = <&XG>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "XH";
 		};
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_acok_od>;
+			irq-pin = <&gpio_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_lid_open: lid_open {
-			irq-gpio = <&gpio_ec_lid_open>;
+			irq-pin = <&gpio_ec_lid_open>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "lid_interrupt";
 		};
 		int_wp: wp {
-			irq-gpio = <&gpio_ec_wp_l>;
+			irq-pin = <&gpio_ec_wp_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "switch_interrupt";
 		};
 		int_pch_slp_s0: pch_slp_s0 {
-			irq-gpio = <&gpio_slp_s0_l>;
+			irq-pin = <&gpio_slp_s0_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pch_slp_s3: pch_slp_s3 {
-			irq-gpio = <&gpio_slp_s3_l>;
+			irq-pin = <&gpio_slp_s3_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pch_slp_sus: pch_slp_sus {
-			irq-gpio = <&gpio_pch_slp_sus_l>;
+			irq-pin = <&gpio_pch_slp_sus_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_dsw_pwrok: dsw_pwrok {
-			irq-gpio = <&gpio_pg_ec_dsw_pwrok>;
+			irq-pin = <&gpio_pg_ec_dsw_pwrok>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pg_rsmrst: pg_rsmrst {
-			irq-gpio = <&gpio_pg_ec_rsmrst_odl>;
+			irq-pin = <&gpio_pg_ec_rsmrst_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_ec_pch_dsw_pwrok: ec_pch_dsw_pwrok {
-			irq-gpio = <&gpio_ec_pch_dsw_pwrok>;
+			irq-pin = <&gpio_ec_pch_dsw_pwrok>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pg_all_pwrgd: pg_all_pwrgd {
-			irq-gpio = <&gpio_pg_ec_all_sys_pwrgd>;
+			irq-pin = <&gpio_pg_ec_all_sys_pwrgd>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_pwr_btn: pwr_btn {
-			irq-gpio = <&gpio_h1_ec_pwr_btn_odl>;
+			irq-pin = <&gpio_h1_ec_pwr_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "power_signal_interrupt";
 		};
 		int_usb_c0_tcpc: usb_c0_tcpc {
-			irq-gpio = <&gpio_usb_c0_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c0_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1_tcpc: usb_c1_tcpc {
-			irq-gpio = <&gpio_usb_c1_tcpc_int_odl>;
+			irq-pin = <&gpio_usb_c1_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "tcpc_alert_event";
 		};
 		int_als_rgb: als_rgb {
-			irq-gpio = <&gpio_ec_als_rgb_int_l>;
+			irq-pin = <&gpio_ec_als_rgb_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcs3400_interrupt";
 		};
 		int_usb_c0_ppc: usb_c0_ppc {
-			irq-gpio = <&gpio_usb_c0_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c0_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c1_ppc: usb_c1_ppc {
-			irq-gpio = <&gpio_usb_c1_ppc_int_odl>;
+			irq-pin = <&gpio_usb_c1_ppc_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "ppc_interrupt";
 		};
 		int_usb_c0_bc12: usb_c0_bc12 {
-			irq-gpio = <&gpio_usb_c0_bc12_int_odl>;
+			irq-pin = <&gpio_usb_c0_bc12_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "bc12_interrupt";
 		};
 		int_usb_c1_mix_bc12: usb_c1_mix_bc12 {
-			irq-gpio = <&gpio_usb_c1_mix_int_odl>;
+			irq-pin = <&gpio_usb_c1_mix_int_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "bc12_interrupt";
 		};
 		int_prochot_in: prochot_in {
-			irq-gpio = <&gpio_ec_prochot_in_l>;
+			irq-pin = <&gpio_ec_prochot_in_l>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "throttle_ap_prochot_input_interrupt";
 		};
 		int_volume_up: volume_up {
-			irq-gpio = <&gpio_ec_volup_btn_odl>;
+			irq-pin = <&gpio_ec_volup_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
 		int_volume_down: volume_down {
-			irq-gpio = <&gpio_ec_voldn_btn_odl>;
+			irq-pin = <&gpio_ec_voldn_btn_odl>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "button_interrupt";
 		};
diff --git a/zephyr/shim/include/zephyr_gpio_signal.h b/zephyr/shim/include/zephyr_gpio_signal.h
index f2a85cb042..374d0d38bf 100644
--- a/zephyr/shim/include/zephyr_gpio_signal.h
+++ b/zephyr/shim/include/zephyr_gpio_signal.h
@@ -79,7 +79,7 @@ BUILD_ASSERT(GPIO_COUNT < GPIO_LIMIT);
  * For example, given the DTS node under "named-gpios":
  *
  * gpio_ec_wp_l: ec_wp_l {
- *	gpios = <&gpioe 5 GPIO_INPUT>;
+ *	gpio = <&gpioe 5 GPIO_INPUT>;
  *	enum-name = "GPIO_WP_L";
  * };
  *
diff --git a/zephyr/shim/src/gpio_int.c b/zephyr/shim/src/gpio_int.c
index 92fce7433b..4357ee67ac 100644
--- a/zephyr/shim/src/gpio_int.c
+++ b/zephyr/shim/src/gpio_int.c
@@ -168,17 +168,17 @@ struct gpio_int_config {
 
 #define GPIO_INT_FUNC(name) extern void name(enum gpio_signal)
 
-#define GPIO_INT_CREATE(id, irq_gpio)					\
+#define GPIO_INT_CREATE(id, irq_pin)					\
 	GPIO_INT_FUNC(DT_STRING_TOKEN(id, handler));			\
 	struct gpio_int_config GPIO_INT_FROM_NODE(id) = {		\
 		.handler = DT_STRING_TOKEN(id, handler),		\
-		.arg = GPIO_SIGNAL(irq_gpio),				\
+		.arg = GPIO_SIGNAL(irq_pin),				\
 		.flags = DT_PROP(id, flags),				\
-		.port = DEVICE_DT_GET(DT_GPIO_CTLR(irq_gpio, gpios)),	\
-		.pin = DT_GPIO_PIN(irq_gpio, gpios),			\
+		.port = DEVICE_DT_GET(DT_GPIO_CTLR(irq_pin, gpios)),	\
+		.pin = DT_GPIO_PIN(irq_pin, gpios),			\
 	};
 
-#define GPIO_INT_DEFN(id) GPIO_INT_CREATE(id, DT_PROP(id, irq_gpio))
+#define GPIO_INT_DEFN(id) GPIO_INT_CREATE(id, DT_PHANDLE(id, irq_pin))
 
 #if DT_HAS_COMPAT_STATUS_OKAY(cros_ec_gpio_interrupts)
 	DT_FOREACH_CHILD(DT_IRQ_NODE, GPIO_INT_DEFN)
@@ -243,17 +243,17 @@ int gpio_disable_dt_interrupt(struct gpio_int_config *conf)
  * the gpio_signal to enable/disable interrupts
  */
 
-#define GPIO_SIG_MAP_ENTRY(id, irq_gpio)                                       \
-	COND_CODE_1(DT_NODE_HAS_PROP(irq_gpio, enum_name),                 \
+#define GPIO_SIG_MAP_ENTRY(id, irq_pin)                                       \
+	COND_CODE_1(DT_NODE_HAS_PROP(irq_pin, enum_name),                 \
 		    (                                                      \
 			    {                                              \
 				    .signal = DT_STRING_UPPER_TOKEN(       \
-					    irq_gpio, enum_name),          \
-				    .config = &GPIO_INT_FROM_NODE(id),	   \
+					    irq_pin, enum_name),          \
+				    .config = &GPIO_INT_FROM_NODE(id), \
 			    },),                                           \
 		    ())
 
-#define GPIO_SIG_MAP(id) GPIO_SIG_MAP_ENTRY(id, DT_PROP(id, irq_gpio))
+#define GPIO_SIG_MAP(id) GPIO_SIG_MAP_ENTRY(id, DT_PHANDLE(id, irq_pin))
 
 static const struct {
 	enum gpio_signal signal;
diff --git a/zephyr/test/drivers/overlay.dts b/zephyr/test/drivers/overlay.dts
index 74de2cfb7c..fe8e604754 100644
--- a/zephyr/test/drivers/overlay.dts
+++ b/zephyr/test/drivers/overlay.dts
@@ -138,32 +138,32 @@
 		compatible = "cros-ec,gpio-interrupts";
 
 		int_ac_present: ac_present {
-			irq-gpio = <&gpio_acok_od>;
+			irq-pin = <&gpio_acok_od>;
 			flags = <GPIO_INT_EDGE_BOTH>;
 			handler = "extpower_interrupt";
 		};
 		int_usb_c0: usb_c0 {
-			irq-gpio = <&usb_c0_tcpc_int_odl>;
+			irq-pin = <&usb_c0_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c1: usb_c1 {
-			irq-gpio = <&usb_c1_tcpc_int_odl>;
+			irq-pin = <&usb_c1_tcpc_int_odl>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "tcpc_alert_event";
 		};
 		int_usb_c0_ppc: usb_c0_ppc {
-			irq-gpio = <&gpio_usb_c0_ppc_int>;
+			irq-pin = <&gpio_usb_c0_ppc_int>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_alert";
 		};
 		int_usb_c1_ppc: usb_c1_ppc {
-			irq-gpio = <&gpio_usb_c1_ppc_int>;
+			irq-pin = <&gpio_usb_c1_ppc_int>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ppc_alert";
 		};
 		int_switchcap_pg: switchcap_pg {
-			irq-gpio = <&gpio_switchcap_pg_int_l>;
+			irq-pin = <&gpio_switchcap_pg_int_l>;
 			flags = <GPIO_INT_EDGE_FALLING>;
 			handler = "ln9310_interrupt";
 		};