zephyr: dts: drop named-gpio labels and match up net names

Label property for named-gpio nodes is unused sice:

dcf34010e2 zephyr: use node name for gpio and pwm structures

Drop the label property from most board dts files, and in few cases
change the node name to match the net name used in the board schematics.

BRANCH=none
BUG=b:208436570
TEST=cq dry-run

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Ic1d97ee216710e94640c854767237106fbeabf6c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3362465
Reviewed-by: Denis Brockus <dbrockus@chromium.org>

15 files changed, 9 insertions, 618 deletions

diff --git a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts
index 0e1297345e..542ecc5d66 100644
--- a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts
+++ b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts
@@ -26,103 +26,83 @@
 		power_button_l: power_button_l {
 			gpios = <&gpioe 4 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "POWER_BUTTON_L";
 		};
 		lid_open: lid_open {
 			gpios = <&gpioe 2 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN";
 		};
 		wp_l {
 			gpios = <&gpioi 4 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_WP_L";
-			label = "WP_L";
 		};
 		pch_pltrst_l {
 			gpios = <&gpioe 3 GPIO_INPUT_PULL_UP>;
 			enum-name = "GPIO_PCH_RSMRST_L";
-			label = "PCH_PLTRST_L";
 		};
 		uart1_rx {
 			gpios = <&gpiob 0 GPIO_INPUT_PULL_UP>;
 			#enum-name = "GPIO_UART1_RX";
-			label = "UART1_RX";
 		};
 		pch_smi_l {
 			gpios = <&gpiod 3 GPIO_OUT_HIGH>;
 			#enum-name = "GPIO_PCH_SMI_L";
-			label = "PCH_SMI_L";
 		};
 		pch_sci_l {
 			gpios = <&gpiod 4 GPIO_OUT_HIGH>;
 			#enum-name = "GPIO_PCH_SCI_L";
-			label = "PCH_SCI_L";
 		};
 		gate_a20_h {
 			gpios = <&gpiob 5 GPIO_OUT_HIGH>;
 			#enum-name = "GPIO_GATE_A20_H";
-			label = "GATE_A20_H";
 		};
 		sys_reset_l {
 			gpios = <&gpiob 6 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_SYS_RESET_L";
-			label = "SYS_RESET_L";
 		};
 		lpc_clkrun_l {
 			gpios = <&gpioh 0 GPIO_OUT_LOW>;
 			#enum-name = "GPIO_LPC_CLKRUN_L";
-			label = "LPC_CLKRUN_L";
 		};
 		pch_wake_l {
 			gpios = <&gpiob 7 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "PCH_WAKE_L";
 		};
 		i2c_a_scl {
 			gpios = <&gpiob 3 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C0_SENSOR_SCL";
-			label = "I2C_A_SCL";
 		};
 		i2c_a_sda {
 			gpios = <&gpiob 4 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C0_SENSOR_SDA";
-			label = "I2C_A_SDA";
 		};
 		i2c_b_scl {
 			gpios = <&gpioc 1 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C1_USB_C0_SCL";
-			label = "I2C_B_SCL";
 		};
 		i2c_b_sda {
 			gpios = <&gpioc 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C1_USB_C0_SDA";
-			label = "I2C_B_SDA";
 		};
 		i2c_c_scl {
 			gpios = <&gpiof 6 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C2_USB_C1_SCL";
-			label = "I2C_C_SCL";
 		};
 		i2c_c_sda {
 			gpios = <&gpiof 7 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C2_USB_C1_SDA";
-			label = "I2C_C_SDA";
 		};
 		i2c_e_scl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C5_BATTERY_SCL";
-			label = "I2C_E_SCL";
 		};
 		i2c_e_sda {
 			gpios = <&gpioe 7 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C5_BATTERY_SDA";
-			label = "I2C_E_SDA";
 		};
 
 		spi0_cs {
 			gpios = <&gpiom 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_SPI0_CS";
-			label = "SPI0_CS";
 		};
 	};
 
diff --git a/zephyr/projects/asurada/hayato/gpio.dts b/zephyr/projects/asurada/hayato/gpio.dts
index 971ba4d936..2a98b4f324 100644
--- a/zephyr/projects/asurada/hayato/gpio.dts
+++ b/zephyr/projects/asurada/hayato/gpio.dts
@@ -10,314 +10,253 @@
 		power_button_l: power_button_l {
 			gpios = <&gpioe 4 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "POWER_BUTTON_L";
 		};
 		lid_open: lid_open {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN";
 		};
 		tablet_mode_l {
 			gpios = <&gpioj 7 GPIO_INPUT>;
 			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
 		};
 		ap_ec_warm_rst_req {
 			gpios = <&gpiod 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_AP_EC_WARM_RST_REQ";
-			label = "AP_EC_WARM_RST_REQ";
 		};
 		ap_ec_watchdog_l: ap_ec_watchdog_l {
 			gpios = <&gpioc 7 (GPIO_INPUT | GPIO_VOLTAGE_1P8 |
 					GPIO_ACTIVE_LOW)>;
 			enum-name = "GPIO_AP_EC_WATCHDOG_L";
-			label = "AP_EC_WATCHDOG_L";
 		};
 		ap_in_sleep_l: ap_in_sleep_l {
 			gpios = <&gpiof 2 (GPIO_INPUT | GPIO_PULL_DOWN |
 					GPIO_VOLTAGE_1P8 | GPIO_ACTIVE_LOW)>;
 			enum-name = "GPIO_AP_IN_SLEEP_L";
-			label = "AP_IN_SLEEP_L";
 		};
-		ap-xhci-init-done {
+		ap_xhci_init_done {
 			gpios = <&gpiod 2 (GPIO_INPUT | GPIO_PULL_DOWN |
 					GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_AP_XHCI_INIT_DONE";
-			label = "AP_XHCI_INIT_DONE";
 		};
 		pmic_ec_pwrgd: pmic_ec_pwrgd {
 			gpios = <&gpiof 3 (GPIO_INPUT | GPIO_PULL_DOWN |
 					GPIO_VOLTAGE_1P8 | GPIO_ACTIVE_HIGH)>;
 			enum-name = "GPIO_PMIC_EC_PWRGD";
-			label = "PMIC_EC_PWRGD";
 		};
 		gpio_accel_gyro_int_l: base_imu_int_l {
 			gpios = <&gpioj 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_IMU_INT_L";
-			label = "BASE_IMU_INT_L";
 		};
 		lid_accel_int_l {
 			gpios = <&gpioj 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_LID_ACCEL_INT_L";
-			label = "LID_ACCEL_INT_L";
 		};
 		als_rgb_int_odl {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 			enum-name = "GPIO_ALS_RGB_INT_ODL";
-			label = "ALS_RGB_INT_ODL";
 		};
 		usb_c0_ppc_int_odl {
 			gpios = <&gpiod 1 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
-			label = "USB_C0_PPC_INT_ODL";
 		};
 		usb_c0_bc12_int_odl {
 			gpios = <&gpioj 6 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_BC12_INT_ODL";
-			label = "USB_C0_BC12_INT_ODL";
 		};
 		usb_c1_bc12_int_l {
 			gpios = <&gpioj 4 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_BC12_INT_L";
-			label = "USB_C1_BC12_INT_L";
 		};
 		volume_down_l {
 			gpios = <&gpiod 5 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "VOLUME_DOWN_L";
 		};
 		volume_up_l {
 			gpios = <&gpiod 6 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_UP_L";
-			label = "VOLUME_UP_L";
 		};
 		ac_present: ac_present {
 			gpios = <&gpioe 5 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "AC_PRESENT";
 		};
 		wp {
 			gpios = <&gpioi 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_WP";
-			label = "WP";
 		};
 		spi0_cs {
 			gpios = <&gpiom 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_SPI0_CS";
-			label = "SPI0_CS";
 		};
 		x_ec_gpio2 {
 			gpios = <&gpiob 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_X_EC_GPIO2";
-			label = "X_EC_GPIO2";
 		};
 		ec_pmic_en_odl {
 			gpios = <&gpiod 0 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_PMIC_EN_ODL";
-			label = "EC_PMIC_EN_ODL";
 		};
 		ec_pmic_watchdog_l {
 			gpios = <&gpioh 0 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_PMIC_WATCHDOG_L";
-			label = "EC_PMIC_WATCHDOG_L";
 		};
 		en_pp5000_a {
 			gpios = <&gpioc 6 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_EN_PP5000_A";
-			label = "EN_PP5000_A";
 		};
 		pg_mt6315_proc_odl {
 			gpios = <&gpioe 1 GPIO_INPUT>;
 			enum-name = "GPIO_PG_MT6315_PROC_ODL";
-			label = "PG_MT6315_PROC_ODL";
 		};
 		pg_mt6360_odl {
 			gpios = <&gpiof 1 GPIO_INPUT>;
 			enum-name = "GPIO_PG_MT6360_ODL";
-			label = "PG_MT6360_ODL";
 		};
 		pg_pp5000_a_odl {
 			gpios = <&gpioa 6 GPIO_INPUT>;
 			enum-name = "GPIO_PG_PP5000_A_ODL";
-			label = "PG_PP5000_A_ODL";
 		};
 		en_slp_z {
 			gpios = <&gpioe 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_SLP_Z";
-			label = "EN_SLP_Z";
 		};
 		sys_rst_odl {
 			gpios = <&gpiob 6 GPIO_ODR_LOW>;
 			enum-name = "GPIO_SYS_RST_ODL";
-			label = "SYS_RST_ODL";
 		};
 		ec_bl_en_od {
 			gpios = <&gpiob 5 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_BL_EN_OD";
-			label = "EC_BL_EN_OD";
 		};
 		ec_int_l {
 			gpios = <&gpioe 6 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_INT_L";
 		};
 		dp_aux_path_sel {
 			gpios = <&gpiog 0 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_DP_AUX_PATH_SEL";
-			label = "DP_AUX_PATH_SEL";
 		};
 		ec_dpbrdg_hpd_odl {
 			gpios = <&gpioj 0 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_DPBRDG_HPD_ODL";
-			label = "EC_DPBRDG_HPD_ODL";
 		};
 		en_pp5000_usb_a0_vbus {
 			gpios = <&gpiob 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP5000_USB_A0_VBUS";
-			label = "EN_PP5000_USB_A0_VBUS";
 		};
 		usb_c0_frs_en {
 			gpios = <&gpioh 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_USB_C0_FRS_EN";
-			label = "USB_C0_FRS_EN";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpioc 0 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
 		};
 		bc12_det_en {
 			gpios = <&gpioj 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_BC12_DET_EN";
-			label = "BC12_DET_EN";
 		};
 		en_ec_id_odl {
 			gpios = <&gpioh 5 GPIO_ODR_LOW>;
 			enum-name = "GPIO_EN_EC_ID_ODL";
-			label = "EN_EC_ID_ODL";
 		};
 		entering_rw {
 			gpios = <&gpioc 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "ENTERING_RW";
 		};
 		en_5v_usm {
 			gpios = <&gpiod 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_5V_USM";
-			label = "EN_5V_USM";
 		};
 		i2c_b_scl {
 			gpios = <&gpiob 3 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_B_SCL";
-			label = "I2C_B_SCL";
 		};
 		i2c_b_sda {
 			gpios = <&gpiob 4 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_B_SDA";
-			label = "I2C_B_SDA";
 		};
 		i2c_c_scl {
 			gpios = <&gpioc 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_I2C_C_SCL";
-			label = "I2C_C_SCL";
 		};
 		i2c_c_sda {
 			gpios = <&gpioc 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_I2C_C_SDA";
-			label = "I2C_C_SDA";
 		};
 		i2c_e_scl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_E_SCL";
-			label = "I2C_E_SCL";
 		};
 		i2c_e_sda {
 			gpios = <&gpioe 7 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_E_SDA";
-			label = "I2C_E_SDA";
 		};
 		i2c_f_scl {
 			gpios = <&gpiof 6 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_F_SCL";
-			label = "I2C_F_SCL";
 		};
 		i2c_f_sda {
 			gpios = <&gpiof 7 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_F_SDA";
-			label = "I2C_F_SDA";
 		};
 		ec_x_gpio1 {
 			gpios = <&gpioh 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_X_GPIO1";
-			label = "EC_X_GPIO1";
 		};
 		ec_x_gpio3 {
 			gpios = <&gpioj 1 GPIO_INPUT>;
 			enum-name = "GPIO_EC_X_GPIO3";
-			label = "EC_X_GPIO3";
 		};
 		set_vmc_volt_at_1v8 {
 			gpios = <&gpiod 4 (GPIO_INPUT | GPIO_PULL_DOWN |
 					GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_SET_VMC_VOLT_AT_1V8";
-			label = "SET_VMC_VOLT_AT_1V8";
 		};
 		en_pp3000_vmc_pmu {
 			gpios = <&gpiod 2 (GPIO_INPUT | GPIO_PULL_DOWN |
 					GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EN_PP3000_VMC_PMU";
-			label = "EN_PP3000_VMC_PMU";
 		};
 		packet_mode_en {
 			gpios = <&gpioa 3 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_PACKET_MODE_EN";
-			label = "PACKET_MODE_EN";
 		};
 		usb_a0_fault_odl {
 			gpios = <&gpioa 7 GPIO_INPUT>;
 			enum-name = "GPIO_USB_A0_FAULT_ODL";
-			label = "USB_A0_FAULT_ODL";
 		};
 		charger_prochot_odl {
 			gpios = <&gpioc 3 GPIO_INPUT>;
 			enum-name = "GPIO_CHARGER_PROCHOT_ODL";
-			label = "CHARGER_PROCHOT_ODL";
 		};
 		pg_mt6315_gpu_odl {
 			gpios = <&gpioh 6 GPIO_INPUT>;
 			enum-name = "GPIO_PG_MT6315_GPU_ODL";
-			label = "PG_MT6315_GPU_ODL";
 		};
 		en_pp3000_sd_u {
 			gpios = <&gpiog 1 (GPIO_INPUT | GPIO_PULL_DOWN |
 					GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EN_PP3000_SD_U";
-			label = "EN_PP3000_SD_U";
 		};
 		ccd_mode_odl {
 			gpios = <&gpioc 4 GPIO_INPUT>;
 			enum-name = "GPIO_CCD_MODE_ODL";
-			label = "CCD_MODE_ODL";
 		};
 		spi_clk_gpg6 {
 			gpios = <&gpiog 6 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_SPI_CLK_GPG6";
-			label = "SPI_CLK_GPG6";
 		};
 		spi_mosi_gpg4 {
 			gpios = <&gpiog 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SPI_MOSI_GPG4";
-			label = "SPI_MOSI_GPG4";
 		};
 		spi_miso_gpg5 {
 			gpios = <&gpiog 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SPI_MISO_GPG5";
-			label = "SPI_MISO_GPG5";
 		};
 		spi_cs_gpg7 {
 			gpios = <&gpiog 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SPI_CS_GPG7";
-			label = "SPI_CS_GPG7";
 		};
 	};
 
diff --git a/zephyr/projects/brya/brya/gpio.dts b/zephyr/projects/brya/brya/gpio.dts
index 7476afcd84..2ca38f03c0 100644
--- a/zephyr/projects/brya/brya/gpio.dts
+++ b/zephyr/projects/brya/brya/gpio.dts
@@ -10,143 +10,116 @@
 		lid_open: lid_open {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN";
 		};
 
-		gsc_ec_pwr_btn_odl: power_btn {
+		gsc_ec_pwr_btn_odl: gsc_ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "GSC_EC_PWR_BTN_ODL";
 		};
 
-		gpio_ec_wp_l: wp_l {
+		gpio_ec_wp_l: ec_wp_odl {
 			#gpio-cells = <0>;
 			gpios = <&gpioa 1 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_ODL";
 		};
 
 		ec_chg_led_y_c1 {
 			gpios = <&gpioc 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_Y_C1";
-			label = "EC_CHG_LED_Y_C1";
 		};
 
 		ec_chg_led_b_c1 {
 			gpios = <&gpioc 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_B_C1";
-			label = "EC_CHG_LED_B_C1";
 		};
 
-		packet_mode_en {
+		ec_gsc_packet_mode {
 			gpios = <&gpio7 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PACKET_MODE_EN";
-			label = "EC_GSC_PACKET_MODE";
 		};
 		acok_od: acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
 		};
-		pch_wake_odl {
+		ec_pch_wake_r_odl {
 			gpios = <&gpioc 0 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "EC_PCH_WAKE_R_ODL";
 		};
-		pch_int_odl {
+		ec_pch_int_odl {
 			gpios = <&gpiob 0 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_PCH_INT_ODL";
 		};
 		pg_ec_dsw_pwrok {
 			gpios = <&gpioc 7 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_DSW_PWROK";
-			label = "PG_EC_DSW_PWROK";
 		};
 		en_s5_rails {
 			gpios = <&gpiob 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_S5_RAILS";
-			label = "EN_S5_RAILS";
 		};
 		sys_rst_odl {
 			gpios = <&gpioc 5 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_SYS_RESET_L";
-			label = "SYS_RST_ODL";
 		};
 		pg_ec_rsmrst_odl {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_RSMRST_ODL";
-			label = "PG_EC_RSMRST_ODL";
 		};
 		ec_pch_rsmrst_odl {
 			gpios = <&gpioa 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PCH_RSMRST_L";
-			label = "EC_PCH_RSMRST_ODL";
 		};
 		pg_ec_all_sys_pwrgd {
 			gpios = <&gpiof 4 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_ALL_SYS_PWRGD";
-			label = "PG_EC_ALL_SYS_PWRGD";
 		};
 		slp_s0_l {
 			gpios = <&gpiod 5 GPIO_INPUT>;
 			enum-name = "GPIO_PCH_SLP_S0_L";
-			label = "SLP_S0_L";
 		};
 		slp_s3_l {
 			gpios = <&gpioa 5 GPIO_INPUT>;
 			enum-name = "GPIO_PCH_SLP_S3_L";
-			label = "SLP_S3_L";
 		};
 		vccst_pwrgd_od {
 			gpios = <&gpioa 4 GPIO_ODR_LOW>;
 			enum-name = "GPIO_VCCST_PWRGD_OD";
-			label = "VCCST_PWRGD_OD";
 		};
 		ec_prochot_odl {
 			gpios = <&gpio6 3 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_CPU_PROCHOT";
-			label = "EC_PROCHOT_ODL";
 		};
 		ec_pch_pwr_btn_odl {
 			gpios = <&gpioc 1 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PCH_PWRBTN_L";
-			label = "EC_PCH_PWR_BTN_ODL";
 		};
 		slp_sus_l {
 			gpios = <&gpiof 1 GPIO_INPUT>;
 			enum-name = "GPIO_SLP_SUS_L";
-			label = "SLP_SUS_L";
 		};
 		pch_pwrok {
 			gpios = <&gpio7 2 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PCH_PWROK";
-			label = "PCH_PWROK";
 		};
 		ec_pch_sys_pwrok {
 			gpios = <&gpio3 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_PCH_SYS_PWROK";
-			label = "EC_PCH_SYS_PWROK";
 		};
 		imvp9_vrrdy_od {
 			gpios = <&gpio4 3 GPIO_INPUT>;
 			enum-name = "GPIO_IMVP9_VRRDY_OD";
-			label = "IMVP9_VRRDY_OD";
 		};
 		ec_edp_bl_en {
 			gpios = <&gpiod 3 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_EDP_BL_EN";
 		};
 		ec_prochot_in_l {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 			enum-name = "GPIO_EC_PROCHOT_IN_L";
-			label = "EC_PROCHOT_IN_L";
 		};
 	};
 
diff --git a/zephyr/projects/corsola/gpio_kingler.dts b/zephyr/projects/corsola/gpio_kingler.dts
index da273e3cf9..6c805a107f 100644
--- a/zephyr/projects/corsola/gpio_kingler.dts
+++ b/zephyr/projects/corsola/gpio_kingler.dts
@@ -9,279 +9,221 @@
 
 		base_imu_int_l {
 			gpios = <&gpio5 6 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "BASE_IMU_INT_L";
 			enum-name = "GPIO_BASE_IMU_INT_L";
 		};
 		spi_ap_clk_ec {
 			gpios = <&gpio5 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "SPI_AP_CLK_EC";
 		};
 		spi_ap_cs_ec_l {
 			gpios = <&gpio5 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "SPI_AP_CS_EC_L";
 			enum-name = "GPIO_SHI_CS_L";
 		};
 		spi_ap_do_ec_di {
 			gpios = <&gpio4 6 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "SPI_AP_DO_EC_DI";
 		};
 		spi_ap_di_ec_do {
 			gpios = <&gpio4 7 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "SPI_AP_DI_EC_DO";
 		};
 		ap_ec_warm_rst_req {
 			gpios = <&gpio5 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "AP_EC_WARM_RST_REQ";
 			enum-name = "GPIO_AP_EC_WARM_RST_REQ";
 		};
 		ap_ec_wdtrst_l {
 			gpios = <&gpio5 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "AP_EC_WDTRST_L";
 			enum-name = "GPIO_AP_EC_WDTRST_L";
 		};
 		ap_in_sleep_l {
 			gpios = <&gpio5 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "AP_IN_SLEEP_L";
 			enum-name = "GPIO_AP_IN_SLEEP_L";
 		};
 		en_ulp {
 			gpios = <&gpioc 6 GPIO_OUT_LOW>;
-			label = "EN_ULP";
 			enum-name = "GPIO_EN_ULP";
 		};
 		en_ec_id_odl {
 			gpios = <&gpio7 6 GPIO_ODR_LOW>;
-			label = "EN_EC_ID_ODL";
 			enum-name = "GPIO_EN_EC_ID_ODL";
 		};
 		sys_rst_odl {
 			gpios = <&gpioc 5 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
-			label = "SYS_RST_ODL";
 			enum-name = "GPIO_SYS_RST_ODL";
 		};
 		ec_i2c_sensor_scl {
 			gpios = <&gpiob 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "EC_I2C_SENSOR_SCL";
 		};
 		ec_i2c_sensor_sda {
 			gpios = <&gpiob 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "EC_I2C_SENSOR_SDA";
 		};
 		ec_i2c_usb_c0_scl {
 			gpios = <&gpio9 0 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_SCL";
 		};
 		ec_i2c_usb_c0_sda {
 			gpios = <&gpio8 7 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_SDA";
 		};
 		ec_i2c_usb_c1_scl {
 			gpios = <&gpio9 2 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_SCL";
 		};
 		ec_i2c_usb_c1_sda {
 			gpios = <&gpio9 1 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_SDA";
 		};
 		ec_i2c_pwr_cbi_scl {
 			gpios = <&gpiod 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "EC_I2C_PWR_CBI_SCL";
 		};
 		ec_i2c_pwr_cbi_sda {
 			gpios = <&gpiod 0 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "EC_I2C_PWR_CBI_SDA";
 		};
 		ec_i2c_batt_scl {
 			gpios = <&gpio3 3 GPIO_INPUT>;
-			label = "EC_I2C_BATT_SCL";
 		};
 		ec_i2c_batt_sda {
 			gpios = <&gpio3 6 GPIO_INPUT>;
-			label = "EC_I2C_BATT_SDA";
 		};
 		ec_pen_chg_dis_odl {
 			gpios = <&gpioe 4 GPIO_INPUT>;
-			label = "EC_PEN_CHG_DIS_ODL";
 			enum-name = "GPIO_EC_PEN_CHG_DIS_ODL";
 		};
 		gpio_ec_wp_l: ec_wp_odl {
 			#gpio-cells = <0>;
 			gpios = <&gpioe 3 (GPIO_OPEN_DRAIN)>;
-			label = "EC_WP_ODL";
 			enum-name = "GPIO_WP_L";
 		};
 		lid_accel_int_l {
 			gpios = <&gpiob 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "LID_ACCEL_INT_L";
 			enum-name = "GPIO_LID_ACCEL_INT_L";
 		};
 		tablet_mode_l {
 			gpios = <&gpiob 2 GPIO_INPUT>;
-			label = "TABLET_MODE_L";
 			enum-name = "GPIO_TABLET_MODE_L";
 		};
 		ec_ap_int_odl {
 			gpios = <&gpioc 1 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
-			label = "EC_AP_INT_ODL";
 			enum-name = "GPIO_EC_INT_L";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
-			label = "EC_KSO_02_INV";
 			enum-name = "GPIO_KBD_KSO2";
 		};
 		usb_c0_bc12_int_odl {
 			gpios = <&gpio8 3 GPIO_INPUT>;
-			label = "USB_C0_BC12_INT_ODL";
 		};
 		ec_entering_rw {
 			gpios = <&gpio0 3 GPIO_OUT_LOW>;
-			label = "EC_ENTERING_RW";
 			enum-name = "GPIO_ENTERING_RW";
 		};
 		charger_prochot_odl {
 			gpios = <&gpiob 1 GPIO_INPUT>;
-			label = "CHARGER_PROCHOT_ODL";
 			enum-name = "GPIO_CHARGER_PROCHOT_ODL";
 		};
 		ec_rst_odl {
 			gpios = <&gpio7 7 GPIO_INPUT>;
-			label = "EC_RST_ODL";
 			enum-name = "GPIO_EC_RST_ODL";
 		};
 		lid_open {
 			gpios = <&gpiod 2 GPIO_INPUT>;
-			label = "LID_OPEN";
 			enum-name = "GPIO_LID_OPEN";
 		};
 		acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
-			label = "ACOK_OD";
 			enum-name = "GPIO_AC_PRESENT";
 		};
 		gsc_ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
-			label = "GSC_EC_PWR_BTN_ODL";
 			enum-name = "GPIO_POWER_BUTTON_L";
 		};
 		en_5v_usm {
 			gpios = <&gpio0 2 GPIO_OUT_LOW>;
-			label = "EN_5V_USM";
 			enum-name = "GPIO_EN_5V_USM";
 		};
 		packet_mode_en {
 			gpios = <&gpio0 2 GPIO_OUT_LOW>;
-			label = "PACKET_MODE_EN";
 			enum-name = "GPIO_PACKET_MODE_EN";
 		};
 		x_ec_gpio2 {
 			gpios = <&gpiod 4 GPIO_INPUT>;
-			label = "X_EC_GPIO2";
 			enum-name = "GPIO_X_EC_GPIO2";
 		};
 		ap_sysrst_odl_r {
 			gpios = <&gpioa 1 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "AP_EC_SYSRST_ODL_R";
 			enum-name = "GPIO_AP_EC_SYSRST_ODL";
 		};
 		ap_xhci_init_done {
 			gpios = <&gpioa 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
-			label = "AP_XHCI_INIT_DONE";
 			enum-name = "GPIO_AP_XHCI_INIT_DONE";
 		};
 		usb_c0_ppc_int_odl {
 			gpios = <&gpio6 7 GPIO_INPUT>;
-			label = "USB_C0_PPC_INT_ODL";
 			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
 		};
 		pg_pp5000_z2_od {
 			gpios = <&gpio7 0 GPIO_INPUT>;
-			label = "PG_PP5000_Z2_OD";
 			enum-name = "GPIO_PG_PP5000_Z2_OD";
 		};
 		ec_x_gpio1 {
 			gpios = <&gpio6 2 GPIO_OUT_LOW>;
-			label = "EC_X_GPIO1";
 			enum-name = "GPIO_EC_X_GPIO1";
 		};
 		dp_aux_path_sel {
 			gpios = <&gpio6 3 GPIO_OUT_LOW>;
-			label = "DP_AUX_PATH_SEL";
 			enum-name = "GPIO_DP_AUX_PATH_SEL";
 		};
 		ec_bl_en_od {
 			gpios = <&gpio4 0 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
-			label = "EC_BL_EN_OD";
 			enum-name = "GPIO_EC_BL_EN_OD";
 		};
 		ec_x_gpio3 {
 			gpios = <&gpiod 3 GPIO_OUT_LOW>;
-			label = "EC_X_GPIO3";
 			enum-name = "GPIO_EC_X_GPIO3";
 		};
 		usb_c0_tcpc_int_odl {
 			gpios = <&gpio7 3 GPIO_INPUT>;
-			label = "USB_C0_TCPC_INT_ODL";
 			enum-name = "GPIO_USB_C0_TCPC_INT_ODL";
 		};
 		usb_c0_tcpc_rst {
 			gpios = <&gpioc 0 GPIO_OUT_LOW>;
-			label = "USB_C0_TCPC_RST";
 			enum-name = "GPIO_USB_C0_TCPC_RST";
 		};
 		en_pp5000_usb_a0_vbus_x {
 			gpios = <&gpio6 0 GPIO_OUT_LOW>;
-			label = "EN_PP5000_USB_A0_VBUS_X";
 			enum-name = "GPIO_EN_PP5000_USB_A0_VBUS";
 		};
 		hdmi_prsnt_odl {
 			gpios = <&gpio3 7 GPIO_INPUT>;
-			label = "HDMI_PRSNT_ODL";
 			enum-name = "GPIO_HDMI_PRSNT_ODL";
 		};
 		en_pp5000_z2 {
 			gpios = <&gpio3 4 GPIO_OUT_HIGH>;
-			label = "EN_PP5000_Z2";
 			enum-name = "GPIO_EN_PP5000_Z2";
 		};
 		usb_c1_tcpc_int_odl {
 			gpios = <&gpioe 1 GPIO_INPUT>;
-			label = "USB_C1_TCPC_INT_ODL";
 			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
-			label = "EC_BATT_PRES_ODL";
 			enum-name = "GPIO_BATT_PRES_ODL";
 		};
 		usb_a0_fault_odl {
 			gpios = <&gpioc 7 GPIO_INPUT>;
-			label = "USB_A0_FAULT_ODL";
 			enum-name = "GPIO_USB_A0_FAULT_ODL";
 		};
 		ec_ap_dp_hpd_odl {
 			gpios = <&gpio6 1 GPIO_ODR_HIGH>;
-			label = "EC_AP_DP_HPD_ODL";
 			enum-name = "GPIO_EC_AP_DP_HPD_ODL";
 		};
 		ec_pmic_en_odl {
 			gpios = <&gpio7 4 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
-			label = "EC_PMIC_EN_ODL";
 			enum-name = "GPIO_EC_PMIC_EN_ODL";
 		};
 		ec_volup_btn_odl {
 			gpios = <&gpiod 5 GPIO_INPUT>;
-			label = "EC_VOLUP_BTN_ODL";
 			enum-name = "GPIO_VOLUME_UP_L";
 		};
 		ec_voldn_btn_odl {
 			gpios = <&gpioe 2 GPIO_INPUT>;
-			label = "EC_VOLDN_BTN_ODL";
 			enum-name = "GPIO_VOLUME_DOWN_L";
 		};
 		ccd_mode_odl {
 			gpios = <&gpioe 5 GPIO_INPUT>;
-			label = "CCD_MODE_ODL";
 			enum-name = "GPIO_CCD_MODE_ODL";
 		};
 	};
diff --git a/zephyr/projects/corsola/gpio_krabby.dts b/zephyr/projects/corsola/gpio_krabby.dts
index a8c78ddc03..c99eabdee2 100644
--- a/zephyr/projects/corsola/gpio_krabby.dts
+++ b/zephyr/projects/corsola/gpio_krabby.dts
@@ -26,259 +26,208 @@
 		power_button_l: power_button_l {
 			gpios = <&gpioe 4 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "POWER_BUTTON_L";
 		};
 		lid_open: lid_open {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN";
 		};
 		tablet_mode_l: tablet_mode_l {
 			gpios = <&gpioj 7 GPIO_INPUT>;
 			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
 		};
 		ap_ec_warm_rst_req: ap_ec_warm_rst_req {
 			gpios = <&gpiod 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_AP_EC_WARM_RST_REQ";
-			label = "AP_EC_WARM_RST_REQ";
 		};
 		ap_in_sleep_l: ap_in_sleep_l {
 			gpios = <&gpiob 6 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_AP_IN_SLEEP_L";
-			label = "AP_IN_SLEEP_L";
 		};
 		base_imu_int_l: base_imu_int_l {
 			gpios = <&gpiom 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_BASE_IMU_INT_L";
-			label = "BASE_IMU_INT_L";
 		};
 		lid_accel_int_l: lid_accel_int_l {
 			gpios = <&gpiom 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_LID_ACCEL_INT_L";
-			label = "LID_ACCEL_INT_L";
 		};
 		volume_down_l: volume_down_l {
 			gpios = <&gpiod 5 GPIO_INPUT>;
 			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "VOLUME_DOWN_L";
 		};
 		volume_up_l: volume_up_l {
 			gpios = <&gpiod 6 GPIO_INPUT>;
 			enum-name = "GPIO_VOLUME_UP_L";
-			label = "VOLUME_UP_L";
 		};
 		ap_xhci_init_done: ap_xhci_init_done {
 			gpios = <&gpioj 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_AP_XHCI_INIT_DONE";
-			label = "AP_XHCI_INIT_DONE";
 		};
 		ac_present: ac_present {
 			gpios = <&gpioe 5 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "AC_PRESENT";
 		};
 		ec_flash_wp_odl: ec_flash_wp_odl {
 			gpios = <&gpioi 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_WP_L";
-			label = "WP_L";
 		};
 		spi0_cs: spi0_cs {
 			gpios = <&gpiom 5 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_SPI0_CS";
-			label = "SPI0_CS";
 		};
 		x_ec_gpio2: x_ec_gpio2 {
 			gpios = <&gpiob 2 (GPIO_INPUT | GPIO_ODR_HIGH)>;
 			enum-name = "GPIO_X_EC_GPIO2";
-			label = "X_EC_GPIO2";
 		};
 		usb_c0_ppc_bc12_int_odl: usb_c0_ppc_bc12_int_odl {
 			gpios = <&gpiod 1 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PPC_BC12_INT_ODL";
-			label = "USB_C0_PPC_BC12_INT_ODL";
 		};
 		usb_c1_bc12_charger_int_odl: usb_c1_bc12_charger_int_odl {
 			gpios = <&gpioj 4 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_BC12_CHARGER_INT_ODL";
-			label = "USB_C1_BC12_CHARGER_INT_ODL";
 		};
 		ec_pmic_en_odl: ec_pmic_en_odl {
 			gpios = <&gpiod 0 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_PMIC_EN_ODL";
-			label = "EC_PMIC_EN_ODL";
 		};
 		en_pp5000_z2: en_pp5000_z2 {
 			gpios = <&gpioc 6 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_EN_PP5000_Z2";
-			label = "EN_PP5000_Z2";
 		};
 		en_ulp: en_ulp {
 			gpios = <&gpioe 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_ULP";
-			label = "EN_ULP";
 		};
 		sys_rst_odl: sys_rst_odl {
 			gpios = <&gpiog 1 GPIO_ODR_LOW>;
 			enum-name = "GPIO_SYS_RST_ODL";
-			label = "SYS_RST_ODL";
 		};
 		ec_bl_en_od: ec_bl_en_od {
 			gpios = <&gpiob 5 (GPIO_ODR_LOW | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_BL_EN_OD";
-			label = "EC_BL_EN_OD";
 		};
 		ap_ec_sysrst_odl: ap_ec_sysrst_odl {
 			gpios = <&gpioj 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_AP_EC_SYSRST_ODL";
-			label = "AP_EC_SYSRST_ODL";
 		};
 		ap_ec_wdtrst_l: ap_ec_wdtrst_l {
 			gpios = <&gpioc 7 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_AP_EC_WDTRST_L";
-			label = "AP_EC_WDTRST_L";
 		};
 		ec_int_l: ec_int_l {
 			gpios = <&gpioe 6 (GPIO_ODR_HIGH | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_INT_L";
 		};
 		dp_aux_path_sel: dp_aux_path_sel {
 			gpios = <&gpiog 0 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_DP_AUX_PATH_SEL";
-			label = "DP_AUX_PATH_SEL";
 		};
 		ec_ap_dp_hpd_odl: ec_ap_dp_hpd_odl {
 			gpios = <&gpioj 0 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_AP_DP_HPD_ODL";
-			label = "EC_AP_DP_HPD_ODL";
 		};
 		en_pp5000_usb_a0_vbus: en_pp5000_usb_a0_vbus {
 			gpios = <&gpiob 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP5000_USB_A0_VBUS";
-			label = "EN_PP5000_USB_A0_VBUS";
 		};
 		usb_c0_ppc_frsinfo: usb_c0_ppc_frsinfo {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PPC_FRSINFO";
-			label = "USB_C0_PPC_FRSINFO";
 		};
 		ec_batt_pres_odl: ec_batt_pres_odl {
 			gpios = <&gpioc 0 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "BATT_PRES_ODL";
 		};
 		en_ec_id_odl: en_ec_id_odl {
 			gpios = <&gpioh 5 GPIO_ODR_LOW>;
 			enum-name = "GPIO_EN_EC_ID_ODL";
-			label = "EN_EC_ID_ODL";
 		};
 		entering_rw: entering_rw {
 			gpios = <&gpioc 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "ENTERING_RW";
 		};
 		en_5v_usm: en_5v_usm {
 			gpios = <&gpiog 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_5V_USM";
-			label = "EN_5V_USM";
 		};
 		usb_a0_fault_odl: usb_a0_fault_odl {
 			gpios = <&gpioj 6 GPIO_INPUT>;
 			enum-name = "GPIO_USB_A0_FAULT_ODL";
-			label = "USB_A0_FAULT_ODL";
 		};
 		i2c_a_scl: i2c_a_scl {
 			gpios = <&gpiob 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_I2C_A_SCL";
-			label = "I2C_A_SCL";
 		};
 		i2c_a_sda: i2c_a_sda {
 			gpios = <&gpiob 4 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_I2C_A_SDA";
-			label = "I2C_A_SDA";
 		};
 		i2c_b_scl: i2c_b_scl {
 			gpios = <&gpioc 1 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_B_SCL";
-			label = "I2C_B_SCL";
 		};
 		i2c_b_sda: i2c_b_sda {
 			gpios = <&gpioc 2 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_B_SDA";
-			label = "I2C_B_SDA";
 		};
 		i2c_c_scl: i2c_c_scl {
 			gpios = <&gpiof 6 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_C_SCL";
-			label = "I2C_C_SCL";
 		};
 		i2c_c_sda: i2c_c_sda {
 			gpios = <&gpiof 7 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_C_SDA";
-			label = "I2C_C_SDA";
 		};
 		i2c_d_scl: i2c_d_scl {
 			gpios = <&gpiof 2 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_I2C_D_SCL";
-			label = "I2C_D_SCL";
 		};
 		i2c_d_sda: i2c_d_sda {
 			gpios = <&gpiof 3 (GPIO_INPUT | GPIO_VOLTAGE_1P8)>;
 			enum-name = "GPIO_I2C_D_SDA";
-			label = "I2C_D_SDA";
 		};
 		i2c_e_scl: i2c_e_scl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_E_SCL";
-			label = "I2C_E_SCL";
 		};
 		i2c_e_sda: i2c_e_sda {
 			gpios = <&gpioe 7 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_E_SDA";
-			label = "I2C_E_SDA";
 		};
 		i2c_f_scl: i2c_f_scl {
 			gpios = <&gpioa 4 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_F_SCL";
-			label = "I2C_F_SCL";
 		};
 		i2c_f_sda: i2c_f_sda {
 			gpios = <&gpioa 5 GPIO_INPUT>;
 			enum-name = "GPIO_I2C_F_SDA";
-			label = "I2C_F_SDA";
 		};
 		ec_x_gpio1: ec_x_gpio1 {
 			gpios = <&gpioh 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_X_GPIO1";
-			label = "EC_X_GPIO1";
 		};
 		ec_x_gpio3: ec_x_gpio3 {
 			gpios = <&gpioj 1 GPIO_INPUT>;
 			enum-name = "GPIO_EC_X_GPIO3";
-			label = "EC_X_GPIO3";
 		};
 		hdmi_prsnt_odl: hdmi_prsnt_odl {
 			gpios = <&gpioj 3 GPIO_INPUT>;
 			enum-name = "GPIO_HDMI_PRSNT_ODL";
-			label = "HDMI_PRSNT_ODL";
 		};
 
 		/* pins used in power/mt8192, to be removed */
 		ap_ec_watchdog_l: ap_ec_watchdog_l {
 			gpios = <&gpiox 0 GPIO_INPUT>;
 			enum-name = "GPIO_AP_EC_WATCHDOG_L";
-			label = "AP_EC_WATCHDOG_L";
 		};
 		ec_pmic_watchdog_l: ec_pmic_watchdog_l {
 			gpios = <&gpiox 0 GPIO_INPUT>;
 			enum-name = "GPIO_EC_PMIC_WATCHDOG_L";
-			label = "EC_PMIC_WATCHDOG_L";
 		};
 		pmic_ec_pwrgd: pmic_ec_pwrgd {
 			gpios = <&gpiox 0 GPIO_INPUT>;
 			enum-name = "GPIO_PMIC_EC_PWRGD";
-			label = "PMIC_EC_PWRGD";
 		};
 	};
 
diff --git a/zephyr/projects/drawcia_riscv/gpio.dts b/zephyr/projects/drawcia_riscv/gpio.dts
index 65cc2f10a9..2aeb4bdca7 100644
--- a/zephyr/projects/drawcia_riscv/gpio.dts
+++ b/zephyr/projects/drawcia_riscv/gpio.dts
@@ -9,30 +9,25 @@
 	named-gpios {
 		compatible = "named-gpios";
 
-		wp_l {
+		ec_wp_od {
 			gpios = <&gpioa 6 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_OD";
 		};
 		ec_entering_rw {
 			gpios = <&gpiog 0 GPIO_OUTPUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
 		};
 		h1_ec_pwr_btn_odl {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "H1_EC_PWR_BTN_ODL";
 		};
 		lid_open {
 			gpios = <&gpiof 3 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "lid_open";
 		};
-		ec_ac_mkbp_int_l {
+		ec_ap_mkbp_int_l {
 			gpios = <&gpiol 5 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_AP_MKBP_INT_L";
 		};
 	};
 
diff --git a/zephyr/projects/herobrine/herobrine_npcx9/gpio.dts b/zephyr/projects/herobrine/herobrine_npcx9/gpio.dts
index 18cca6a25d..3ec84f130b 100644
--- a/zephyr/projects/herobrine/herobrine_npcx9/gpio.dts
+++ b/zephyr/projects/herobrine/herobrine_npcx9/gpio.dts
@@ -10,157 +10,126 @@
 		usb_c0_pd_int_odl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PD_INT_ODL";
-			label = "USB_C0_PD_INT_ODL";
 		};
 		usb_c1_pd_int_odl {
 			gpios = <&gpiof 5 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_PD_INT_ODL";
-			label = "USB_C1_PD_INT_ODL";
 		};
 		usb_c0_swctl_int_odl {
 			gpios = <&gpio0 3 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_SWCTL_INT_ODL";
-			label = "USB_C0_SWCTL_INT_ODL";
 		};
 		usb_c1_swctl_int_odl {
 			gpios = <&gpio4 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_SWCTL_INT_ODL";
-			label = "USB_C1_SWCTL_INT_ODL";
 		};
 		gpio_usb_c0_bc12_int_l: usb_c0_bc12_int_l {
 			gpios = <&gpio6 1 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_C0_BC12_INT_L";
-			label = "USB_C0_BC12_INT_L";
 		};
 		gpio_usb_c1_bc12_int_l: usb_c1_bc12_int_l {
 			gpios = <&gpio8 2 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_C1_BC12_INT_L";
-			label = "USB_C1_BC12_INT_L";
 		};
 		usb_a0_oc_odl {
 			gpios = <&gpiof 4 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_A0_OC_ODL";
-			label = "USB_A0_OC_ODL";
 		};
 		gpio_chg_acok_od: chg_acok_od {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "CHG_ACOK_OD";
 		};
 		gpio_ec_pwr_btn_odl: ec_pwr_btn_odl {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "EC_PWR_BTN_ODL";
 		};
 		ec_voldn_btn_odl {
 			gpios = <&gpio6 2 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "EC_VOLDN_BTN_ODL";
 		};
 		ec_volup_btn_odl {
 			gpios = <&gpioc 2 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_UP_L";
-			label = "EC_VOLUP_BTN_ODL";
 		};
 		ec_wp_odl {
 			gpios = <&gpiod 3 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_ODL";
 		};
 		gpio_lid_open_ec: lid_open_ec {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN_EC";
 		};
 		ap_rst_l {
 			gpios = <&gpio5 1 GPIO_INPUT>;
 			enum-name = "GPIO_AP_RST_L";
-			label = "AP_RST_L";
 		};
 		ps_hold {
 			gpios = <&gpioa 6 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_PS_HOLD";
-			label = "PS_HOLD";
 		};
 		ap_suspend {
 			gpios = <&gpio5 7 GPIO_INPUT>;
 			enum-name = "GPIO_AP_SUSPEND";
-			label = "AP_SUSPEND";
 		};
-		power_good {
+		mb_power_good {
 			gpios = <&gpio3 7 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_POWER_GOOD";
-			label = "MB_POWER_GOOD";
 		};
 		warm_reset_l {
 			gpios = <&gpiob 0 GPIO_INPUT>;
 			enum-name = "GPIO_WARM_RESET_L";
-			label = "WARM_RESET_L";
 		};
 		ap_ec_spi_cs_l {
 			gpios = <&gpio5 3 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CS_L";
 		};
 		tablet_mode_l {
 			gpios = <&gpioc 6 GPIO_INPUT>;
 			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
 		};
 		gpio_accel_gyro_int_l: accel_gyro_int_l {
 			gpios = <&gpioa 3 GPIO_INPUT>;
 			enum-name = "GPIO_ACCEL_GYRO_INT_L";
-			label = "ACCEL_GYRO_INT_L";
 		};
 		gpio_rtc_ec_wake_odl: rtc_ec_wake_odl {
 			#gpio-cells = <0>;
 			gpios = <&gpio0 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_RST_ODL";
-			label = "EC_RST_ODL";
 		};
 		ec_entering_rw {
 			gpios = <&gpio7 2 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
 		};
 		ccd_mode_odl {
 			gpios = <&gpio6 3 GPIO_INPUT>;
 			enum-name = "GPIO_CCD_MODE_ODL";
-			label = "CCD_MODE_ODL";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpioe 5 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
 		};
 		ec_gsc_packet_mode {
 			gpios = <&gpio8 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PACKET_MODE_EN";
-			label = "EC_GSC_PACKET_MODE";
 		};
 		pmic_resin_l {
 			gpios = <&gpioa 0 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_RESIN_L";
-			label = "PMIC_RESIN_L";
 		};
 		pmic_kpd_pwr_odl {
 			gpios = <&gpioa 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_KPD_PWR_ODL";
-			label = "PMIC_KPD_PWR_ODL";
 		};
 		ap_ec_int_l {
 			gpios = <&gpio5 6 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "AP_EC_INT_L";
 		};
 		gpio_switchcap_on: switchcap_on {
 			gpios = <&gpiod 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SWITCHCAP_ON";
-			label = "SWITCHCAP_ON";
 		};
 		en_pp5000_s5 {
 			gpios = <&gpio7 3 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_EN_PP5000";
-			label = "EN_PP5000_S5";
 		};
 		ec_bl_disable_l {
 			/* The PMIC controls backlight enable and this pin must
@@ -170,137 +139,109 @@
 			 */
 			gpios = <&gpiob 6 GPIO_INPUT>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_BL_DISABLE_L";
 		};
 		lid_accel_int_l {
 			gpios = <&gpioa 1 GPIO_INPUT>;
 			enum-name = "GPIO_LID_ACCEL_INT_L";
-			label = "LID_ACCEL_INT_L";
 		};
 		tp_int_gate {
 			gpios = <&gpio7 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_TRACKPAD_INT_GATE";
-			label = "TP_INT_GATE";
 		};
 		usb_c0_pd_rst_l {
 			gpios = <&gpiof 1 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_USB_C0_PD_RST_L";
-			label = "USB_C0_PD_RST_L";
 		};
 		usb_c1_pd_rst_l {
 			gpios = <&gpioe 4 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_USB_C1_PD_RST_L";
-			label = "USB_C1_PD_RST_L";
 		};
 		dp_mux_oe_l {
 			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_DP_MUX_OE_L";
-			label = "DP_MUX_OE_L";
 		};
 		dp_mux_sel {
 			gpios = <&gpio4 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_MUX_SEL";
-			label = "DP_MUX_SEL";
 		};
 		dp_hot_plug_det_r {
 			gpios = <&gpio9 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_HOT_PLUG_DET";
-			label = "DP_HOT_PLUG_DET_R";
 		};
 		en_usb_a_5v {
 			gpios = <&gpiof 0 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_USB_A_5V";
-			label = "EN_USB_A_5V";
 		};
 		usb_a_cdp_ilim_en_l {
 			gpios = <&gpio7 5 GPIO_OUT_HIGH>;
-			label = "USB_A_CDP_ILIM_EN_L";
 		};
 		usb_c0_frs_en {
 			gpios = <&gpioc 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_USB_C0_FRS_EN";
-			label = "USB_C0_FRS_EN";
 		};
 		usb_c1_frs_en {
 			gpios = <&gpioc 1 GPIO_OUT_LOW>;
 			enum-name = "GPIO_USB_C1_FRS_EN";
-			label = "USB_C1_FRS_EN";
 		};
 		ec_chg_led_y_c0 {
 			gpios = <&gpio6 0 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_Y_C0";
-			label = "EC_CHG_LED_Y_C0";
 		};
 		ec_chg_led_w_c0 {
 			gpios = <&gpioc 0 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_W_C0";
-			label = "EC_CHG_LED_W_C0";
 		};
 		ec_chg_led_y_c1 {
 			gpios = <&gpioc 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_Y_C1";
-			label = "EC_CHG_LED_Y_C1";
 		};
 		ec_chg_led_w_c1 {
 			gpios = <&gpioc 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_W_C1";
-			label = "EC_CHG_LED_W_C1";
 		};
 		ap_ec_spi_mosi {
 			gpios = <&gpio4 6 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MOSI";
 		};
 		ap_ec_spi_miso {
 			gpios = <&gpio4 7 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MISO";
 		};
 		ap_ec_spi_clk {
 			gpios = <&gpio5 5 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CLK";
 		};
 		gpio_brd_id0: brd_id0 {
 			gpios = <&gpio9 4 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION1";
-			label = "BRD_ID0";
 		};
 		gpio_brd_id1: brd_id1 {
 			gpios = <&gpio9 7 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION2";
-			label = "BRD_ID1";
 		};
 		gpio_brd_id2: brd_id2 {
 			gpios = <&gpioa 5 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION3";
-			label = "BRD_ID2";
 		};
 		gpio_sku_id0: sku_id0 {
 			gpios = <&gpio6 7 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID0";
-			label = "SKU_ID0";
 		};
 		gpio_sku_id1: sku_id1 {
 			gpios = <&gpio7 0 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID1";
-			label = "SKU_ID1";
 		};
 		gpio_sku_id2: sku_id2 {
 			gpios = <&gpioe 1 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID2";
-			label = "SKU_ID2";
 		};
 		gpio_switchcap_pg: src_vph_pwr_pg {
 			gpios = <&gpioe 2 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_SWITCHCAP_PG";
-			label = "SRC_VPH_PWR_PG";
 		};
 		arm_x86 {
 			gpios = <&gpio6 6 GPIO_OUT_LOW>;
-			label = "ARM_X86";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
 		};
 	};
 
diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks_overlay.dts
index 86fa044c5d..bac45f91c1 100644
--- a/zephyr/projects/nissa/nivviks_overlay.dts
+++ b/zephyr/projects/nissa/nivviks_overlay.dts
@@ -29,7 +29,6 @@
 		gpio_sub_usb_c1_int_odl: sub_usb_c1_int_odl {
 			#gpio-cells = <0>;
 			gpios = <&gpio0 2 GPIO_INPUT>;
-			label = "SUB_USB_C1_INT_ODL";
 			enum-name = "GPIO_USB_C1_PD_INT_ODL";
 		};
 	};
diff --git a/zephyr/projects/npcx_evb/npcx7/gpio.dts b/zephyr/projects/npcx_evb/npcx7/gpio.dts
index fb8f83803f..bb4a22a18b 100644
--- a/zephyr/projects/npcx_evb/npcx7/gpio.dts
+++ b/zephyr/projects/npcx_evb/npcx7/gpio.dts
@@ -9,61 +9,49 @@
 
 		recovery_l {
 			gpios = <&gpio0 3 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "RECOVERY_L";
 		};
 		wp_l {
 			gpios = <&gpio9 3 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_WP_L";
-			label = "WP_L";
 		};
 		gpio_ac_present: ac_present {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "AC_PRESENT";
 		};
 		gpio_power_button_l: power_button_l {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "POWER_BUTTON_L";
 		};
 		gpio_lid_open: lid_open {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN";
 		};
 		entering_rw {
 			gpios = <&gpio3 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "ENTERING_RW";
 		};
 		pch_wake_l {
 			gpios = <&gpio5 0 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "PCH_WAKE_L";
 		};
 		gpio_pgood_fan: pgood_fan {
 			gpios = <&gpioc 7 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_PGOOD_FAN";
-			label = "PGOOD_FAN";
 		};
 		spi_cs_l {
 			gpios = <&gpioa 5 GPIO_OUT_HIGH>;
-			label = "SPI_CS_L";
 		};
 		board_version1 {
 			gpios = <&gpio6 4 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION1";
-			label = "BOARD_VERSION1";
 		};
 		board_version2 {
 			gpios = <&gpio6 5 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION2";
-			label = "BOARD_VERSION2";
 		};
 		board_version3 {
 			gpios = <&gpio6 6 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION3";
-			label = "BOARD_VERSION3";
 		};
 	};
 
diff --git a/zephyr/projects/npcx_evb/npcx9/gpio.dts b/zephyr/projects/npcx_evb/npcx9/gpio.dts
index fb8f83803f..bb4a22a18b 100644
--- a/zephyr/projects/npcx_evb/npcx9/gpio.dts
+++ b/zephyr/projects/npcx_evb/npcx9/gpio.dts
@@ -9,61 +9,49 @@
 
 		recovery_l {
 			gpios = <&gpio0 3 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "RECOVERY_L";
 		};
 		wp_l {
 			gpios = <&gpio9 3 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_WP_L";
-			label = "WP_L";
 		};
 		gpio_ac_present: ac_present {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "AC_PRESENT";
 		};
 		gpio_power_button_l: power_button_l {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "POWER_BUTTON_L";
 		};
 		gpio_lid_open: lid_open {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN";
 		};
 		entering_rw {
 			gpios = <&gpio3 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "ENTERING_RW";
 		};
 		pch_wake_l {
 			gpios = <&gpio5 0 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "PCH_WAKE_L";
 		};
 		gpio_pgood_fan: pgood_fan {
 			gpios = <&gpioc 7 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_PGOOD_FAN";
-			label = "PGOOD_FAN";
 		};
 		spi_cs_l {
 			gpios = <&gpioa 5 GPIO_OUT_HIGH>;
-			label = "SPI_CS_L";
 		};
 		board_version1 {
 			gpios = <&gpio6 4 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION1";
-			label = "BOARD_VERSION1";
 		};
 		board_version2 {
 			gpios = <&gpio6 5 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION2";
-			label = "BOARD_VERSION2";
 		};
 		board_version3 {
 			gpios = <&gpio6 6 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION3";
-			label = "BOARD_VERSION3";
 		};
 	};
 
diff --git a/zephyr/projects/skyrim/gpio.dts b/zephyr/projects/skyrim/gpio.dts
index bbe49469ea..142560d6e2 100644
--- a/zephyr/projects/skyrim/gpio.dts
+++ b/zephyr/projects/skyrim/gpio.dts
@@ -4,346 +4,270 @@
 
 		ec_wp_l {
 			gpios = <&gpio5 0 GPIO_INPUT>;
-			label = "EC_WP_L";
 			enum-name = "GPIO_WP_L";
 		};
 		ccd_mode_odl {
 			gpios = <&gpioc 6 GPIO_ODR_HIGH>;
-			label = "CCD_MODE_ODL";
 		};
 		ec_gsc_packet_mode {
 			gpios = <&gpiob 1 GPIO_OUT_LOW>;
-			label = "EC_GSC_PACKET_MODE";
 		};
 		mech_pwr_btn_odl {
 			gpios = <&gpiod 2 GPIO_INPUT>;
-			label = "MECH_PWR_BTN_ODL";
 			enum-name = "GPIO_POWER_BUTTON_L";
 		};
 		ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
-			label = "EC_PWR_BTN_ODL";
 			enum-name = "GPIO_EC_PWR_BTN_ODL";
 		};
 		slp_s3_l {
 			gpios = <&gpio6 1 GPIO_INPUT>;
-			label = "SLP_S3_L";
 			enum-name = "GPIO_PCH_SLP_S3_L";
 		};
 		slp_s5_l {
 			gpios = <&gpio7 2 GPIO_INPUT>;
-			label = "SLP_S5_L";
 			enum-name = "GPIO_PCH_SLP_S5_L";
 		};
 		slp_s3_s0i3_l {
 			gpios = <&gpio7 4 GPIO_INPUT>;
-			label = "SLP_S3_S0I3_L";
 			enum-name = "GPIO_PCH_SLP_S0_L";
 		};
 		pg_pwr_s5 {
 			gpios = <&gpioc 0 GPIO_INPUT>;
-			label = "PG_PWR_S5";
 			enum-name = "GPIO_S5_PGOOD";
 		};
 		gpio_s0_pgood: pg_pcore_s0_r_od {
 			gpios = <&gpiob 6 GPIO_INPUT>;
-			label = "PG_PCORE_S0_R_OD";
 			enum-name = "GPIO_S0_PGOOD";
 		};
 		acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
-			label = "ACOK_OD";
 			enum-name = "GPIO_AC_PRESENT";
 		};
 		ec_pcore_int_odl {
 			gpios = <&gpiof 0 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_PCORE_INT_ODL";
 			enum-name = "GPIO_EC_PCORE_INT_ODL";
 		};
 		pg_groupc_s0_od {
 			gpios = <&gpioa 3 GPIO_INPUT>;
-			label = "PG_GROUPC_S0_OD";
 			enum-name = "GPIO_PG_GROUPC_S0_OD";
 		};
 		pg_lpddr4x_s3_od {
 			gpios = <&gpio9 5 GPIO_INPUT>;
-			label = "PG_LPDDR4X_S3_OD";
 			enum-name = "GPIO_PG_LPDDR4X_S3_OD";
 		};
 		en_pwr_s5 {
 			gpios = <&gpiob 7 GPIO_OUT_LOW>;
-			label = "EN_PWR_S5";
 			enum-name = "GPIO_EN_PWR_A";
 		};
 		en_pwr_s0_r {
 			gpios = <&gpiof 1 GPIO_OUT_LOW>;
-			label = "EN_PWR_S0_R";
 			enum-name = "GPIO_EN_PWR_S0_R";
 		};
 		en_pwr_pcore_s0_r {
 			gpios = <&gpioe 1 GPIO_OUT_LOW>;
-			label = "EN_PWR_PCORE_S0_R";
 			enum-name = "GPIO_EN_PWR_PCORE_S0_R";
 		};
 		ec_entering_rw {
 			gpios = <&gpio6 6 GPIO_OUT_LOW>;
-			label = "EC_ENTERING_RW";
 			enum-name = "GPIO_ENTERING_RW";
 		};
 		ec_sys_rst_l {
 			gpios = <&gpio7 6 GPIO_ODR_HIGH>;
-			label = "EC_SYS_RST_L";
 			enum-name = "GPIO_SYS_RESET_L";
 		};
 		ec_soc_rsmrst_l {
 			gpios = <&gpioc 5 GPIO_OUT_LOW>;
-			label = "EC_SOC_RSMRST_L";
 			enum-name = "GPIO_PCH_RSMRST_L";
 		};
 		ec_clr_cmos {
 			gpios = <&gpioa 1 GPIO_OUT_LOW>;
-			label = "EC_CLR_CMOS";
 		};
 		ec_mem_event {
 			gpios = <&gpioa 5 GPIO_OUT_LOW>;
-			label = "EC_MEM_EVENT";
 		};
 		ec_soc_pwr_btn_l {
 			gpios = <&gpio6 3 GPIO_OUT_HIGH>;
-			label = "EC_SOC_PWR_BTN_L";
 			enum-name = "GPIO_PCH_PWRBTN_L";
 		};
 		ec_soc_pwr_good {
 			gpios = <&gpiod 3 GPIO_OUT_LOW>;
-			label = "EC_SOC_PWR_GOOD";
 			enum-name = "GPIO_PCH_SYS_PWROK";
 		};
 		ec_soc_wake_l {
 			gpios = <&gpio0 3 GPIO_OUT_HIGH>;
-			label = "EC_SOC_WAKE_L";
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
 		};
 		ec_soc_int_l {
 			gpios = <&gpio8 3 GPIO_OUT_HIGH>;
-			label = "EC_SOC_INT_L";
 		};
 		prochot_odl {
 			gpios = <&gpiod 5 GPIO_ODR_HIGH>;
-			label = "PROCHOT_ODL";
 			enum-name = "GPIO_CPU_PROCHOT";
 		};
 		soc_alert_ec_l {
 			gpios = <&gpioe 2 GPIO_INPUT>;
-			label = "SOC_ALERT_EC_L";
 		};
 		soc_thermtrip_odl {
 			gpios = <&gpioe 5 GPIO_INPUT>;
-			label = "SOC_THERMTRIP_ODL";
 		};
 		usb_c0_tcpc_int_odl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
-			label = "USB_C0_TCPC_INT_ODL";
 			enum-name = "GPIO_USB_C0_TCPC_INT_ODL";
 		};
 		usb_c1_tcpc_int_odl {
 			gpios = <&gpioc 7 GPIO_INPUT>;
-			label = "USB_C1_TCPC_INT_ODL";
 			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
 		};
 		usb_c0_ppc_int_odl {
 			gpios = <&gpio7 5 GPIO_INPUT>;
-			label = "USB_C0_PPC_INT_ODL";
 			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
 		};
 		usb_c1_ppc_int_odl {
 			gpios = <&gpiod 4 GPIO_INPUT>;
-			label = "USB_C1_PPC_INT_ODL";
 			enum-name = "GPIO_USB_C1_PPC_INT_ODL";
 		};
 		usb_c0_bc12_int_odl {
 			gpios = <&gpioa 4 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "USB_C0_BC12_INT_ODL";
 			enum-name = "GPIO_USB_C0_BC12_INT_ODL";
 		};
 		usb_c1_bc12_int_odl {
 			gpios = <&gpio9 6 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "USB_C1_BC12_INT_ODL";
 			enum-name = "GPIO_USB_C1_BC12_INT_ODL";
 		};
 		usb_c0_c1_fault_odl {
 			gpios = <&gpio7 3 GPIO_ODR_HIGH>;
-			label = "USB_C0_C1_FAULT_ODL";
 			enum-name = "GPIO_USB_C0_C1_FAULT_ODL";
 		};
 		usb_c0_tcpc_rst_l {
 			gpios = <&gpio3 4 GPIO_OUT_HIGH>;
-			label = "USB_C0_TCPC_RST_L";
 			enum-name = "GPIO_USB_C0_TCPC_RST_L";
 		};
 		usb_c1_tcpc_rst_l {
 			gpios = <&gpio3 7 GPIO_OUT_HIGH>;
-			label = "USB_C1_TCPC_RST_L";
 			enum-name = "GPIO_USB_C1_TCPC_RST_L";
 		};
 		usb_c0_hpd {
 			gpios = <&gpiof 5 GPIO_OUT_LOW>;
-			label = "USB_C0_HPD";
 			enum-name = "GPIO_USB_C0_DP_HPD";
 		};
 		usb_c1_hpd {
 			gpios = <&gpiof 4 GPIO_OUT_LOW>;
-			label = "USB_C1_HPD";
 			enum-name = "GPIO_USB_C1_DP_HPD";
 		};
 		3axis_int_l {
 			gpios = <&gpioa 2 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "3AXIS_INT_L";
 		};
 		lid_open {
 			gpios = <&gpio0 2 GPIO_INPUT>;
-			label = "LID_OPEN";
 			enum-name = "GPIO_LID_OPEN";
 		};
 		voldn_btn_odl {
 			gpios = <&gpioa 7 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "VOLDN_BTN_ODL";
 			enum-name = "GPIO_VOLUME_DOWN_L";
 		};
 		volup_btn_odl {
 			gpios = <&gpio9 3 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "VOLUP_BTN_ODL";
 			enum-name = "GPIO_VOLUME_UP_L";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpio9 4 GPIO_INPUT>;
-			label = "EC_BATT_PRES_ODL";
 			enum-name = "GPIO_BATT_PRES_ODL";
 		};
 		ec_disable_disp_bl {
 			gpios = <&gpioa 6 GPIO_OUT_HIGH>;
-			label = "EC_DISABLE_DISP_BL";
 		};
 		ec_i2c_usb_a0_c0_scl {
 			gpios = <&gpiob 5 GPIO_INPUT>;
-			label = "EC_I2C_USB_A0_C0_SCL";
 		};
 		ec_i2c_usb_a0_c0_sda {
 			gpios = <&gpiob 4 GPIO_INPUT>;
-			label = "EC_I2C_USB_A0_C0_SDA";
 		};
 		ec_i2c_usb_a1_c1_scl {
 			gpios = <&gpio9 0 GPIO_INPUT>;
-			label = "EC_I2C_USB_A1_C1_SCL";
 		};
 		ec_i2c_usb_a1_c1_sda {
 			gpios = <&gpio8 7 GPIO_INPUT>;
-			label = "EC_I2C_USB_A1_C1_SDA";
 		};
 		ec_i2c_batt_scl {
 			gpios = <&gpio9 2 GPIO_INPUT>;
-			label = "EC_I2C_BATT_SCL";
 		};
 		ec_i2c_batt_sda {
 			gpios = <&gpio9 1 GPIO_INPUT>;
-			label = "EC_I2C_BATT_SDA";
 		};
 		ec_i2c_usbc_mux_scl {
 			gpios = <&gpiod 1 GPIO_INPUT>;
-			label = "EC_I2C_USBC_MUX_SCL";
 		};
 		ec_i2c_usbc_mux_sda {
 			gpios = <&gpiod 0 GPIO_INPUT>;
-			label = "EC_I2C_USBC_MUX_SDA";
 		};
 		ec_i2c_power_scl {
 			gpios = <&gpiof 3 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SCL";
 		};
 		ec_i2c_power_sda {
 			gpios = <&gpiof 2 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SDA";
 		};
 		ec_i2c_cbi_scl {
 			gpios = <&gpio3 3 GPIO_INPUT>;
-			label = "EC_I2C_CBI_SCL";
 		};
 		ec_i2c_cbi_sda {
 			gpios = <&gpio3 6 GPIO_INPUT>;
-			label = "EC_I2C_CBI_SDA";
 		};
 		ec_i2c_sensor_scl {
 			gpios = <&gpioe 4 GPIO_INPUT>;
-			label = "EC_I2C_SENSOR_SCL";
 		};
 		ec_i2c_sensor_sda {
 			gpios = <&gpioe 3 GPIO_INPUT>;
-			label = "EC_I2C_SENSOR_SDA";
 		};
 		ec_i2c_soc_sic {
 			gpios = <&gpiob 3 GPIO_INPUT>;
-			label = "EC_I2C_SOC_SIC";
 		};
 		ec_i2c_soc_sid {
 			gpios = <&gpiob 2 GPIO_INPUT>;
-			label = "EC_I2C_SOC_SID";
 		};
 		en_kb_bl {
 			gpios = <&gpio9 7 GPIO_OUT_HIGH>;
-			label = "EN_KB_BL";
 			enum-name = "GPIO_EN_KEYBOARD_BACKLIGHT";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
-			label = "EC_KSO_02_INV";
 			enum-name = "GPIO_KBD_KSO2";
 		};
 		ec_espi_rst_l {
 			gpios = <&gpio5 4 GPIO_PULL_UP>;
-			label = "EC_ESPI_RST_L";
 		};
 		6axis_int_l {
 			gpios = <&gpioa 0 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "6AXIS_INT_L";
 		};
 		tablet_mode {
 			gpios = <&gpioc 1 GPIO_INPUT>;
-			label = "TABLET_MODE";
 		};
 		ec_gpio56 {
 			gpios = <&gpio5 6 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_GPIO56";
 		};
 		ec_ps2_clk {
 			gpios = <&gpio6 7 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_PS2_CLK";
 		};
 		ec_ps2_dat {
 			gpios = <&gpio7 0 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_PS2_DAT";
 		};
 		ec_ps2_rst {
 			gpios = <&gpio6 2 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_PS2_RST";
 		};
 		ec_gpiob0 {
 			gpios = <&gpiob 0 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_GPIOB0";
 		};
 		ec_gpio81 {
 			gpios = <&gpio8 1 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_GPIO81";
 		};
 		ec_flprg2 {
 			gpios = <&gpio8 6 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_FLPRG2";
 		};
 		ec_psl_gpo {
 			gpios = <&gpiod 7 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_PSL_GPO";
 		};
 		ec_pwm7 {
 			gpios = <&gpio6 0 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_PWM7";
 		};
 	};
 
diff --git a/zephyr/projects/trogdor/lazor/gpio.dts b/zephyr/projects/trogdor/lazor/gpio.dts
index 282ea97bb4..301a9ff7fb 100644
--- a/zephyr/projects/trogdor/lazor/gpio.dts
+++ b/zephyr/projects/trogdor/lazor/gpio.dts
@@ -10,363 +10,287 @@
 		usb_c0_pd_int_odl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PD_INT_ODL";
-			label = "USB_C0_PD_INT_ODL";
 		};
 		usb_c1_pd_int_odl {
 			gpios = <&gpiof 5 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_PD_INT_ODL";
-			label = "USB_C1_PD_INT_ODL";
 		};
 		usb_c0_swctl_int_odl {
 			gpios = <&gpio0 3 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_SWCTL_INT_ODL";
-			label = "USB_C0_SWCTL_INT_ODL";
 		};
 		usb_c1_swctl_int_odl {
 			gpios = <&gpio4 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_SWCTL_INT_ODL";
-			label = "USB_C1_SWCTL_INT_ODL";
 		};
 		usb_c0_bc12_int_l {
 			gpios = <&gpio6 1 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_C0_BC12_INT_L";
-			label = "USB_C0_BC12_INT_L";
 		};
 		usb_c1_bc12_int_l {
 			gpios = <&gpio8 2 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_C1_BC12_INT_L";
-			label = "USB_C1_BC12_INT_L";
 		};
 		usb_a0_oc_odl {
 			gpios = <&gpiod 1 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_A0_OC_ODL";
-			label = "USB_A0_OC_ODL";
 		};
 		gpio_acok_od: acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
 		};
 		ccd_mode_odl {
 			gpios = <&gpioe 3 GPIO_INPUT>;
 			enum-name = "GPIO_CCD_MODE_ODL";
-			label = "CCD_MODE_ODL";
 		};
 		gpio_ec_pwr_btn_odl: ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "EC_PWR_BTN_ODL";
 		};
 		ec_voldn_btn_odl {
 			gpios = <&gpio7 0 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "EC_VOLDN_BTN_ODL";
 		};
 		ec_volup_btn_odl {
 			gpios = <&gpiof 2 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_UP_L";
-			label = "EC_VOLUP_BTN_ODL";
 		};
 		ec_wp_odl {
 			gpios = <&gpioa 1 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_ODL";
 		};
 		gpio_lid_open_ec: lid_open_ec {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN_EC";
 		};
 		ap_rst_l {
 			gpios = <&gpioc 1 GPIO_INPUT>;
 			enum-name = "GPIO_AP_RST_L";
-			label = "AP_RST_L";
 		};
 		ps_hold {
 			gpios = <&gpioa 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_PS_HOLD";
-			label = "PS_HOLD";
 		};
 		ap_suspend {
 			gpios = <&gpio5 7 GPIO_INPUT>;
 			enum-name = "GPIO_AP_SUSPEND";
-			label = "AP_SUSPEND";
 		};
 		deprecated_ap_rst_req {
 			gpios = <&gpioc 2 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_DEPRECATED_AP_RST_REQ";
-			label = "DEPRECATED_AP_RST_REQ";
 		};
 		power_good {
 			gpios = <&gpio5 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_POWER_GOOD";
-			label = "POWER_GOOD";
 		};
 		warm_reset_l {
 			gpios = <&gpiof 4 GPIO_INPUT>;
 			enum-name = "GPIO_WARM_RESET_L";
-			label = "WARM_RESET_L";
 		};
 		ap_ec_spi_cs_l {
 			gpios = <&gpio5 3 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CS_L";
 		};
 		tablet_mode_l {
 			gpios = <&gpioc 6 GPIO_INPUT>;
 			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
 		};
 		gpio_accel_gyro_int_l: accel_gyro_int_l {
 			gpios = <&gpioa 0 GPIO_INPUT>;
 			enum-name = "GPIO_ACCEL_GYRO_INT_L";
-			label = "ACCEL_GYRO_INT_L";
 		};
 		da9313_gpio0 {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_DA9313_GPIO0";
-			label = "DA9313_GPIO0";
 		};
 		switchcap_pg_int_l {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_SWITCHCAP_PG_INT_L";
-			label = "SWITCHCAP_PG_INT_L";
 		};
 		gpio_ec_rst_odl: ec_rst_odl {
 			gpios = <&gpio0 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_RST_ODL";
-			label = "EC_RST_ODL";
 		};
 		ec_entering_rw {
 			gpios = <&gpioe 1 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpioe 5 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
 		};
 		pm845_resin_l {
 			gpios = <&gpio3 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_RESIN_L";
-			label = "PM845_RESIN_L";
 		};
 		pmic_kpd_pwr_odl {
 			gpios = <&gpiod 6 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_KPD_PWR_ODL";
-			label = "PMIC_KPD_PWR_ODL";
 		};
 		ec_int_l {
 			gpios = <&gpioa 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_INT_L";
 		};
 		qsip_on {
 			gpios = <&gpio5 0 GPIO_OUT_LOW>;
 			enum-name = "GPIO_QSIP_ON";
-			label = "QSIP_ON";
 		};
 		hibernate_l {
 			gpios = <&gpio5 2 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_HIBERNATE_L";
-			label = "HIBERNATE_L";
 		};
 		switchcap_on {
 			gpios = <&gpiod 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SWITCHCAP_ON";
-			label = "SWITCHCAP_ON";
 		};
 		switchcap_on_l {
 			gpios = <&gpiod 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SWITCHCAP_ON_L";
-			label = "SWITCHCAP_ON_L";
 		};
 		vbob_en {
 			gpios = <&gpiod 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_VBOB_EN";
-			label = "VBOB_EN";
 		};
 		en_pp3300_a {
 			gpios = <&gpioa 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP3300_A";
-			label = "EN_PP3300_A";
 		};
 		en_pp5000_a {
 			gpios = <&gpio6 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP5000";
-			label = "EN_PP5000_A";
 		};
 		ec_bl_disable_l {
 			gpios = <&gpiob 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_BL_DISABLE_L";
 		};
 		lid_accel_int_l {
 			gpios = <&gpio5 6 GPIO_INPUT>;
 			enum-name = "GPIO_LID_ACCEL_INT_L";
-			label = "LID_ACCEL_INT_L";
 		};
 		trackpad_int_gate {
 			gpios = <&gpio7 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_TRACKPAD_INT_GATE";
-			label = "TRACKPAD_INT_GATE";
 		};
 		usb_c0_pd_rst_l {
 			gpios = <&gpiof 1 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_USB_C0_PD_RST_L";
-			label = "USB_C0_PD_RST_L";
 		};
 		usb_c1_pd_rst_l {
 			gpios = <&gpioe 4 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_USB_C1_PD_RST_L";
-			label = "USB_C1_PD_RST_L";
 		};
 		dp_mux_oe_l {
 			gpios = <&gpio9 6 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_DP_MUX_OE_L";
-			label = "DP_MUX_OE_L";
 		};
 		dp_mux_sel {
 			gpios = <&gpio4 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_MUX_SEL";
-			label = "DP_MUX_SEL";
 		};
 		dp_hot_plug_det {
 			gpios = <&gpio9 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_HOT_PLUG_DET";
-			label = "DP_HOT_PLUG_DET";
 		};
 		en_usb_a_5v {
 			gpios = <&gpio8 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_USB_A_5V";
-			label = "EN_USB_A_5V";
 		};
 		usb_a_cdp_ilim_en {
 			gpios = <&gpio7 5 GPIO_OUT_HIGH>;
-			label = "USB_A_CDP_ILIM_EN";
 		};
 		ec_chg_led_y_c1 {
 			gpios = <&gpioc 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_Y_C1";
-			label = "EC_CHG_LED_Y_C1";
 		};
 		ec_chg_led_b_c1 {
 			gpios = <&gpioc 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_B_C1";
-			label = "EC_CHG_LED_B_C1";
 		};
 		ap_ec_spi_mosi {
 			gpios = <&gpio4 6 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MOSI";
 		};
 		ap_ec_spi_miso {
 			gpios = <&gpio4 7 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MISO";
 		};
 		ap_ec_spi_clk {
 			gpios = <&gpio5 5 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CLK";
 		};
 		kb_bl_pwm {
 			gpios = <&gpio8 0 GPIO_INPUT>;
-			label = "KB_BL_PWM";
 		};
 		edp_bkltctl {
 			gpios = <&gpiob 7 GPIO_INPUT>;
-			label = "EDP_BKLTCTL";
 		};
 		ppvar_boostin_sense {
 			gpios = <&gpio4 4 GPIO_INPUT>;
-			label = "PPVAR_BOOSTIN_SENSE";
 		};
 		charger_iadp {
 			gpios = <&gpio4 3 GPIO_INPUT>;
-			label = "CHARGER_IADP";
 		};
 		charger_pmon {
 			gpios = <&gpio4 2 GPIO_INPUT>;
-			label = "CHARGER_PMON";
 		};
 		ec_i2c_power_scl {
 			gpios = <&gpiob 5 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SCL";
 		};
 		ec_i2c_power_sda {
 			gpios = <&gpiob 4 GPIO_INPUT>;
-			label = "EC_I2C_POWER_SDA";
 		};
 		ec_i2c_usb_c0_pd_scl {
 			gpios = <&gpio9 0 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_PD_SCL";
 		};
 		ec_i2c_usb_c0_pd_sda {
 			gpios = <&gpio8 7 GPIO_INPUT>;
-			label = "EC_I2C_USB_C0_PD_SDA";
 		};
 		ec_i2c_usb_c1_pd_scl {
 			gpios = <&gpio9 2 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_PD_SCL";
 		};
 		ec_i2c_usb_c1_pd_sda {
 			gpios = <&gpio9 1 GPIO_INPUT>;
-			label = "EC_I2C_USB_C1_PD_SDA";
 		};
 		ec_i2c_eeprom_scl {
 			gpios = <&gpio3 3 GPIO_INPUT>;
-			label = "EC_I2C_EEPROM_SCL";
 		};
 		ec_i2c_eeprom_sda {
 			gpios = <&gpio3 6 GPIO_INPUT>;
-			label = "EC_I2C_EEPROM_SDA";
 		};
 		ec_i2c_sensor_scl {
 			gpios = <&gpiob 3 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C_SENSOR_SCL";
-			label = "EC_I2C_SENSOR_SCL";
 		};
 		ec_i2c_sensor_sda {
 			gpios = <&gpiob 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C_SENSOR_SDA";
-			label = "EC_I2C_SENSOR_SDA";
 		};
 		gpio_brd_id0: brd_id0 {
 			gpios = <&gpioc 7 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION1";
-			label = "BRD_ID0";
 		};
 		gpio_brd_id1: brd_id1 {
 			gpios = <&gpio9 3 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION2";
-			label = "BRD_ID1";
 		};
 		gpio_brd_id2: brd_id2 {
 			gpios = <&gpio6 3 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION3";
-			label = "BRD_ID2";
 		};
 		gpio_sku_id0: sku_id0 {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID0";
-			label = "SKU_ID0";
 		};
 		gpio_sku_id1: sku_id1 {
 			gpios = <&gpio4 1 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID1";
-			label = "SKU_ID1";
 		};
 		gpio_sku_id2: sku_id2 {
 			gpios = <&gpiod 4 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID2";
-			label = "SKU_ID2";
 		};
 		arm_x86 {
 			gpios = <&gpio6 6 GPIO_OUT_LOW>;
-			label = "ARM_X86";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
 		};
 	};
 
diff --git a/zephyr/projects/trogdor/trogdor/gpio.dts b/zephyr/projects/trogdor/trogdor/gpio.dts
index 956db72960..a69eda053a 100644
--- a/zephyr/projects/trogdor/trogdor/gpio.dts
+++ b/zephyr/projects/trogdor/trogdor/gpio.dts
@@ -10,311 +10,247 @@
 		usb_c0_pd_int_odl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PD_INT_ODL";
-			label = "USB_C0_PD_INT_ODL";
 		};
 		usb_c1_pd_int_odl {
 			gpios = <&gpiof 5 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_PD_INT_ODL";
-			label = "USB_C1_PD_INT_ODL";
 		};
 		usb_c0_swctl_int_odl {
 			gpios = <&gpio0 3 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_SWCTL_INT_ODL";
-			label = "USB_C0_SWCTL_INT_ODL";
 		};
 		usb_c1_swctl_int_odl {
 			gpios = <&gpio4 0 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_SWCTL_INT_ODL";
-			label = "USB_C1_SWCTL_INT_ODL";
 		};
 		usb_c0_bc12_int_l {
 			gpios = <&gpio6 1 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_C0_BC12_INT_L";
-			label = "USB_C0_BC12_INT_L";
 		};
 		usb_c1_bc12_int_l {
 			gpios = <&gpio8 2 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_C1_BC12_INT_L";
-			label = "USB_C1_BC12_INT_L";
 		};
 		usb_a0_oc_odl {
 			gpios = <&gpiod 1 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_USB_A0_OC_ODL";
-			label = "USB_A0_OC_ODL";
 		};
 		gpio_chg_acok_od: chg_acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "CHG_ACOK_OD";
 		};
 		gpio_ec_pwr_btn_odl: ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "EC_PWR_BTN_ODL";
 		};
 		ec_voldn_btn_odl {
 			gpios = <&gpio7 0 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_DOWN_L";
-			label = "EC_VOLDN_BTN_ODL";
 		};
 		ec_volup_btn_odl {
 			gpios = <&gpiof 2 (GPIO_INPUT | GPIO_PULL_UP)>;
 			enum-name = "GPIO_VOLUME_UP_L";
-			label = "EC_VOLUP_BTN_ODL";
 		};
 		ec_wp_odl {
 			gpios = <&gpioa 1 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_ODL";
 		};
 		gpio_lid_open_ec: lid_open_ec {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "LID_OPEN_EC";
 		};
 		ap_rst_l {
 			gpios = <&gpioc 1 GPIO_INPUT>;
 			enum-name = "GPIO_AP_RST_L";
-			label = "AP_RST_L";
 		};
 		ps_hold {
 			gpios = <&gpioa 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_PS_HOLD";
-			label = "PS_HOLD";
 		};
 		ap_suspend {
 			gpios = <&gpio5 7 GPIO_INPUT>;
 			enum-name = "GPIO_AP_SUSPEND";
-			label = "AP_SUSPEND";
 		};
 		deprecated_ap_rst_req {
 			gpios = <&gpioc 2 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_DEPRECATED_AP_RST_REQ";
-			label = "DEPRECATED_AP_RST_REQ";
 		};
 		power_good {
 			gpios = <&gpio5 4 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_POWER_GOOD";
-			label = "POWER_GOOD";
 		};
 		warm_reset_l {
 			gpios = <&gpiof 4 GPIO_INPUT>;
 			enum-name = "GPIO_WARM_RESET_L";
-			label = "WARM_RESET_L";
 		};
 		ap_ec_spi_cs_l {
 			gpios = <&gpio5 3 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CS_L";
 		};
 		tablet_mode_l {
 			gpios = <&gpioc 6 GPIO_INPUT>;
 			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
 		};
 		gpio_accel_gyro_int_l: accel_gyro_int_l {
 			gpios = <&gpioa 0 GPIO_INPUT>;
 			enum-name = "GPIO_ACCEL_GYRO_INT_L";
-			label = "ACCEL_GYRO_INT_L";
 		};
 		gpio_ec_rst_odl: ec_rst_odl {
 			gpios = <&gpio0 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_RST_ODL";
-			label = "EC_RST_ODL";
 		};
 		ec_entering_rw {
 			gpios = <&gpioe 1 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
 		};
 		ccd_mode_odl {
 			gpios = <&gpioe 3 GPIO_INPUT>;
 			enum-name = "GPIO_CCD_MODE_ODL";
-			label = "CCD_MODE_ODL";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpioe 5 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
 		};
 		pmic_resin_l {
 			gpios = <&gpio3 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_RESIN_L";
-			label = "PMIC_RESIN_L";
 		};
 		pmic_kpd_pwr_odl {
 			gpios = <&gpiod 6 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PMIC_KPD_PWR_ODL";
-			label = "PMIC_KPD_PWR_ODL";
 		};
 		ec_int_l {
 			gpios = <&gpioa 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_INT_L";
-			label = "EC_INT_L";
 		};
 		hibernate_l {
 			gpios = <&gpio5 2 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_HIBERNATE_L";
-			label = "HIBERNATE_L";
 		};
 		switchcap_on {
 			gpios = <&gpiod 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_SWITCHCAP_ON";
-			label = "SWITCHCAP_ON";
 		};
 		en_pp3300_a {
 			gpios = <&gpioa 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP3300_A";
-			label = "EN_PP3300_A";
 		};
 		en_pp5000_a {
 			gpios = <&gpio6 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP5000";
-			label = "EN_PP5000_A";
 		};
 		ec_bl_disable_l {
 			gpios = <&gpiob 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_BL_DISABLE_L";
 		};
 		lid_accel_int_l {
 			gpios = <&gpio5 6 GPIO_INPUT>;
 			enum-name = "GPIO_LID_ACCEL_INT_L";
-			label = "LID_ACCEL_INT_L";
 		};
 		trackpad_int_gate {
 			gpios = <&gpio7 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_TRACKPAD_INT_GATE";
-			label = "TRACKPAD_INT_GATE";
 		};
 		usb_c0_pd_rst_l {
 			gpios = <&gpiof 1 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_USB_C0_PD_RST_L";
-			label = "USB_C0_PD_RST_L";
 		};
 		usb_c1_pd_rst_l {
 			gpios = <&gpioe 4 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_USB_C1_PD_RST_L";
-			label = "USB_C1_PD_RST_L";
 		};
 		dp_mux_oe_l {
 			gpios = <&gpio9 6 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_DP_MUX_OE_L";
-			label = "DP_MUX_OE_L";
 		};
 		dp_mux_sel {
 			gpios = <&gpio4 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_MUX_SEL";
-			label = "DP_MUX_SEL";
 		};
 		dp_hot_plug_det {
 			gpios = <&gpio9 5 GPIO_OUT_LOW>;
 			enum-name = "GPIO_DP_HOT_PLUG_DET";
-			label = "DP_HOT_PLUG_DET";
 		};
 		en_usb_a_5v {
 			gpios = <&gpio8 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_USB_A_5V";
-			label = "EN_USB_A_5V";
 		};
 		usb_a_cdp_ilim_en_l {
 			gpios = <&gpio7 5 GPIO_OUT_HIGH>;
-			label = "USB_A_CDP_ILIM_EN_L";
 		};
 		ec_chg_led_y_c0 {
 			gpios = <&gpio6 0 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_Y_C0";
-			label = "EC_CHG_LED_Y_C0";
 		};
 		ec_chg_led_w_c0 {
 			gpios = <&gpioc 0 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_W_C0";
-			label = "EC_CHG_LED_W_C0";
 		};
 		ec_chg_led_y_c1 {
 			gpios = <&gpioc 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_Y_C1";
-			label = "EC_CHG_LED_Y_C1";
 		};
 		ec_chg_led_w_c1 {
 			gpios = <&gpioc 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_CHG_LED_W_C1";
-			label = "EC_CHG_LED_W_C1";
 		};
 		ap_ec_spi_mosi {
 			gpios = <&gpio4 6 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MOSI";
 		};
 		ap_ec_spi_miso {
 			gpios = <&gpio4 7 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_MISO";
 		};
 		ap_ec_spi_clk {
 			gpios = <&gpio5 5 (GPIO_INPUT | GPIO_PULL_DOWN)>;
-			label = "AP_EC_SPI_CLK";
 		};
 		kb_bl_pwm {
 			gpios = <&gpio8 0 GPIO_INPUT>;
-			label = "KB_BL_PWM";
 		};
 		edp_bkltctl {
 			gpios = <&gpiob 7 GPIO_INPUT>;
-			label = "EDP_BKLTCTL";
 		};
 		ppvar_boostin_sense {
 			gpios = <&gpio4 4 GPIO_INPUT>;
-			label = "PPVAR_BOOSTIN_SENSE";
 		};
 		charger_iadp {
 			gpios = <&gpio4 3 GPIO_INPUT>;
-			label = "CHARGER_IADP";
 		};
 		charger_pmon {
 			gpios = <&gpio4 2 GPIO_INPUT>;
-			label = "CHARGER_PMON";
 		};
 		brd_id0 {
 			gpios = <&gpioc 7 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION1";
-			label = "BRD_ID0";
 		};
 		brd_id1 {
 			gpios = <&gpio9 3 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION2";
-			label = "BRD_ID1";
 		};
 		brd_id2 {
 			gpios = <&gpio6 3 GPIO_INPUT>;
 			enum-name = "GPIO_BOARD_VERSION3";
-			label = "BRD_ID2";
 		};
 		sku_id0 {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID0";
-			label = "SKU_ID0";
 		};
 		sku_id1 {
 			gpios = <&gpio4 1 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID1";
-			label = "SKU_ID1";
 		};
 		sku_id2 {
 			gpios = <&gpiod 4 GPIO_INPUT>;
 			enum-name = "GPIO_SKU_ID2";
-			label = "SKU_ID2";
 		};
 		switchcap_gpio_1 {
 			gpios = <&gpioe 2 (GPIO_INPUT | GPIO_PULL_DOWN)>;
 			enum-name = "GPIO_SWITCHCAP_PG";
-			label = "SWITCHCAP_GPIO_1";
 		};
 		arm_x86 {
 			gpios = <&gpio6 6 GPIO_OUT_LOW>;
-			label = "ARM_X86";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
 		};
 	};
 
diff --git a/zephyr/projects/volteer/delbin/gpio.dts b/zephyr/projects/volteer/delbin/gpio.dts
index f7fdc35921..52eb44537d 100644
--- a/zephyr/projects/volteer/delbin/gpio.dts
+++ b/zephyr/projects/volteer/delbin/gpio.dts
@@ -10,328 +10,256 @@
 		ec_lid_open {
 			gpios = <&gpiod 2 GPIO_INPUT>;
 			enum-name = "GPIO_LID_OPEN";
-			label = "EC_LID_OPEN";
 		};
 		ec_wp_l {
 			gpios = <&gpioa 1 GPIO_INPUT>;
 			enum-name = "GPIO_WP_L";
-			label = "EC_WP_L";
 		};
 		h1_ec_pwr_btn_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_POWER_BUTTON_L";
-			label = "H1_EC_PWR_BTN_ODL";
 		};
 		acok_od {
 			gpios = <&gpio0 0 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
 		};
 		slp_s0_l {
 			gpios = <&gpiod 5 GPIO_INPUT>;
 			enum-name = "GPIO_PCH_SLP_S0_L";
-			label = "SLP_S0_L";
 		};
 		slp_s3_l {
 			gpios = <&gpioa 5 GPIO_INPUT>;
 			enum-name = "GPIO_PCH_SLP_S3_L";
-			label = "SLP_S3_L";
 		};
 		slp_sus_l {
 			gpios = <&gpiod 7 GPIO_INPUT>;
 			enum-name = "GPIO_SLP_SUS_L";
-			label = "SLP_SUS_L";
 		};
 		pg_ec_rsmrst_odl {
 			gpios = <&gpioe 2 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_RSMRST_ODL";
-			label = "PG_EC_RSMRST_ODL";
 		};
 		dsw_pwrok {
 			gpios = <&gpioc 7 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_DSW_PWROK";
-			label = "DSW_PWROK";
 		};
 		pg_ec_all_sys_pwrgd {
 			gpios = <&gpiof 4 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_ALL_SYS_PWRGD";
-			label = "PG_EC_ALL_SYS_PWRGD";
 		};
 		gpio_ec_imu_int_l: ec_imu_int_l {
 			gpios = <&gpio5 6 GPIO_INPUT>;
 			enum-name = "GPIO_EC_IMU_INT_L";
-			label = "EC_IMU_INT_L";
 		};
 		tablet_mode_l {
 			gpios = <&gpio9 5 GPIO_INPUT>;
 			enum-name = "GPIO_TABLET_MODE_L";
-			label = "TABLET_MODE_L";
 		};
 		ec_accel_int {
 			gpios = <&gpio8 1 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_ACCEL_INT";
 		};
 		usb_c0_tcpc_int_odl {
 			gpios = <&gpioe 0 GPIO_INPUT>;
-			label = "USB_C0_TCPC_INT_ODL";
 		};
 		usb_c1_tcpc_int_odl {
 			gpios = <&gpioa 2 GPIO_INPUT>;
-			label = "USB_C1_TCPC_INT_ODL";
 		};
 		usb_c0_ppc_int_odl {
 			gpios = <&gpio6 2 GPIO_INPUT>;
-			label = "USB_C0_PPC_INT_ODL";
 		};
 		usb_c1_ppc_int_odl {
 			gpios = <&gpiof 5 GPIO_INPUT>;
-			label = "USB_C1_PPC_INT_ODL";
 		};
 		usb_c0_bc12_int_odl {
 			gpios = <&gpioe 4 GPIO_INPUT>;
-			label = "USB_C0_BC12_INT_ODL";
 		};
 		usb_c1_mix_int_odl {
 			gpios = <&gpio0 3 GPIO_INPUT>;
-			label = "USB_C1_MIX_INT_ODL";
 		};
 		ec_voldn_btn_odl {
 			gpios = <&gpio9 3 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_VOLDN_BTN_ODL";
 		};
 		ec_volup_btn_odl {
 			gpios = <&gpio9 7 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "EC_VOLUP_BTN_ODL";
 		};
 		en_pp3300_a {
 			gpios = <&gpioa 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP3300_A";
-			label = "EN_PP3300_A";
 		};
 		en_pp5000_a {
 			gpios = <&gpioa 4 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PP5000";
-			label = "EN_PP5000_A";
 		};
 		en_ppvar_vccin {
 			gpios = <&gpio4 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EN_PPVAR_VCCIN";
-			label = "EN_PPVAR_VCCIN";
 		};
 		ec_rst_odl {
 			gpios = <&gpio0 2 GPIO_INPUT>;
-			label = "EC_RST_ODL";
 		};
 		ec_pch_sys_pwrok {
 			gpios = <&gpio3 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_EC_PCH_SYS_PWROK";
-			label = "EC_PCH_SYS_PWROK";
 		};
 		ec_pch_rsmrst_odl {
 			gpios = <&gpioa 6 GPIO_ODR_LOW>;
 			enum-name = "GPIO_PCH_RSMRST_L";
-			label = "EC_PCH_RSMRST_ODL";
 		};
 		ec_pch_pwr_btn_odl {
 			gpios = <&gpioc 1 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_PCH_PWRBTN_L";
-			label = "EC_PCH_PWR_BTN_ODL";
 		};
 		ec_pch_rtcrst {
 			gpios = <&gpio7 6 GPIO_OUT_LOW>;
 			enum-name = "GPIO_PCH_RTCRST";
-			label = "EC_PCH_RTCRST";
 		};
 		ec_pch_wake_odl {
 			gpios = <&gpio7 4 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "EC_PCH_WAKE_ODL";
 		};
 		ec_entering_rw {
 			gpios = <&gpioe 3 GPIO_OUT_LOW>;
 			enum-name = "GPIO_ENTERING_RW";
-			label = "EC_ENTERING_RW";
 		};
 		ec_prochot_odl {
 			gpios = <&gpio6 3 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_CPU_PROCHOT";
-			label = "EC_PROCHOT_ODL";
 		};
 		ec_prochot_in_l {
 			gpios = <&gpiof 0 GPIO_INPUT>;
 			enum-name = "GPIO_EC_PROCHOT_IN_L";
-			label = "EC_PROCHOT_IN_L";
 		};
 		sys_rst_odl {
 			gpios = <&gpioc 5 GPIO_ODR_HIGH>;
 			enum-name = "GPIO_SYS_RESET_L";
-			label = "SYS_RST_ODL";
 		};
 		ec_pch_int_odl {
 			gpios = <&gpiob 0 GPIO_ODR_HIGH>;
-			label = "EC_PCH_INT_ODL";
 		};
 		en_pp5000_usba {
 			gpios = <&gpioc 6 GPIO_OUT_LOW>;
-			label = "EN_PP5000_USBA";
 		};
 		usb_a_low_pwr_od {
 			gpios = <&gpio6 6 GPIO_ODR_LOW>;
-			label = "USB_A_LOW_PWR_OD";
 		};
 		usb_c0_rt_rst_odl {
 			gpios = <&gpiod 4 GPIO_ODR_LOW>;
-			label = "USB_C0_RT_RST_ODL";
 		};
 		usb_c1_rt_rst_odl {
 			gpios = <&gpio8 3 GPIO_ODR_LOW>;
-			label = "USB_C1_RT_RST_ODL";
 		};
 		usb_c0_oc_odl {
 			gpios = <&gpiob 1 GPIO_ODR_HIGH>;
-			label = "USB_C0_OC_ODL";
 		};
 		usb_c1_oc_odl {
 			gpios = <&gpio5 0 GPIO_ODR_HIGH>;
-			label = "USB_C1_OC_ODL";
 		};
 		uart2_ec_rx {
 			gpios = <&gpio7 5 GPIO_OUT_LOW>;
-			label = "UART2_EC_RX";
 		};
 		led_1_l {
 			gpios = <&gpioc 4 GPIO_OUT_HIGH>;
-			label = "LED_1_L";
 		};
 		led_2_l {
 			gpios = <&gpioc 3 GPIO_OUT_HIGH>;
-			label = "LED_2_L";
 		};
 		led_3_l {
 			gpios = <&gpioc 2 GPIO_OUT_HIGH>;
-			label = "LED_3_L";
 		};
 		ccd_mode_odl {
 			gpios = <&gpioe 5 GPIO_INPUT>;
-			label = "CCD_MODE_ODL";
 		};
 		ec_kb_bl_en {
 			gpios = <&gpio8 6 GPIO_OUT_LOW>;
-			label = "EC_KB_BL_EN";
 		};
 		unused_gpio34 {
 			gpios = <&gpio3 4 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "UNUSED_GPIO34";
 		};
 		unused_gpio41 {
 			gpios = <&gpio4 1 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "UNUSED_GPIO41";
 		};
 		unused_gpio72 {
 			gpios = <&gpio7 2 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "UNUSED_GPIO72";
 		};
 		unused_gpio96 {
 			gpios = <&gpio9 6 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "UNUSED_GPIO96";
 		};
 		unused_gpioa7 {
 			gpios = <&gpioa 7 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "UNUSED_GPIOA7";
 		};
 		unused_gpioc0 {
 			gpios = <&gpioc 0 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "UNUSED_GPIOC0";
 		};
 		unused_gpiof2 {
 			gpios = <&gpiof 2 (GPIO_INPUT | GPIO_PULL_UP)>;
-			label = "UNUSED_GPIOF2";
 		};
 		ec_edp_bl_en {
 			gpios = <&gpiod 3 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_ENABLE_BACKLIGHT";
-			label = "EC_EDP_BL_EN";
 		};
 		ec_i2c0_sensor_scl {
 			gpios = <&gpiob 5 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C0_SENSOR_SCL";
-			label = "EC_I2C0_SENSOR_SCL";
 		};
 		ec_i2c0_sensor_sda {
 			gpios = <&gpiob 4 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C0_SENSOR_SDA";
-			label = "EC_I2C0_SENSOR_SDA";
 		};
 		ec_i2c1_usb_c0_scl {
 			gpios = <&gpio9 0 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C1_USB_C0_SCL";
-			label = "EC_I2C1_USB_C0_SCL";
 		};
 		ec_i2c1_usb_c0_sda {
 			gpios = <&gpio8 7 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C1_USB_C0_SDA";
-			label = "EC_I2C1_USB_C0_SDA";
 		};
 		ec_i2c2_usb_c1_scl {
 			gpios = <&gpio9 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C2_USB_C1_SCL";
-			label = "EC_I2C2_USB_C1_SCL";
 		};
 		ec_i2c2_usb_c1_sda {
 			gpios = <&gpio9 1 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C2_USB_C1_SDA";
-			label = "EC_I2C2_USB_C1_SDA";
 		};
 		ec_i2c3_usb_1_mix_scl {
 			gpios = <&gpiod 1 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C3_USB_1_MIX_SCL";
-			label = "EC_I2C3_USB_1_MIX_SCL";
 		};
 		ec_i2c3_usb_1_mix_sda {
 			gpios = <&gpiod 0 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C3_USB_1_MIX_SDA";
-			label = "EC_I2C3_USB_1_MIX_SDA";
 		};
 		ec_i2c5_power_scl {
 			gpios = <&gpio3 3 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C5_BATTERY_SCL";
-			label = "EC_I2C5_POWER_SCL";
 		};
 		ec_i2c5_power_sda {
 			gpios = <&gpio3 6 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C5_BATTERY_SDA";
-			label = "EC_I2C5_POWER_SDA";
 		};
 		ec_i2c7_eeprom_scl {
 			gpios = <&gpiob 3 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C7_EEPROM_PWR_SCL_R";
-			label = "EC_I2C7_EEPROM_SCL";
 		};
 		ec_i2c7_eeprom_sda {
 			gpios = <&gpiob 2 GPIO_INPUT>;
 			enum-name = "GPIO_EC_I2C7_EEPROM_PWR_SDA_R";
-			label = "EC_I2C7_EEPROM_SDA";
 		};
 		ec_batt_pres_odl {
 			gpios = <&gpioe 1 GPIO_INPUT>;
-			label = "EC_BATT_PRES_ODL";
 		};
 		usb_c0_dp_hpd {
 			gpios = <&gpiof 3 GPIO_INPUT>;
-			label = "USB_C0_DP_HPD";
 		};
 		usb_c1_dp_hpd {
 			gpios = <&gpio7 0 GPIO_INPUT>;
-			label = "USB_C1_DP_HPD";
 		};
 		en_pp5000_fan {
 			gpios = <&gpio6 1 GPIO_OUT_LOW>;
-			label = "EN_PP5000_FAN";
 		};
 		ec_kso_02_inv {
 			gpios = <&gpio1 7 GPIO_OUT_LOW>;
 			enum-name = "GPIO_KBD_KSO2";
-			label = "EC_KSO_02_INV";
 		};
 	};
 
diff --git a/zephyr/test/drivers/overlay.dts b/zephyr/test/drivers/overlay.dts
index 49379772d4..0be0c0b945 100644
--- a/zephyr/test/drivers/overlay.dts
+++ b/zephyr/test/drivers/overlay.dts
@@ -25,12 +25,10 @@
 		ec_batt_pres_odl {
 			gpios = <&gpio0 1 GPIO_INPUT>;
 			enum-name = "GPIO_BATT_PRES_ODL";
-			label = "EC_BATT_PRES_ODL";
 		};
 		acok_od {
 			gpios = <&gpio0 2 GPIO_INPUT>;
 			enum-name = "GPIO_AC_PRESENT";
-			label = "ACOK_OD";
 		};
 		/* In test WP is output because CBI use it, but it is also
 		 * input, because test_all_tags set it to enable write
@@ -40,69 +38,56 @@
 			#gpio-cells = <0>;
 			gpios = <&gpio0 3 (GPIO_INPUT | GPIO_OUTPUT)>;
 			enum-name = "GPIO_WP_L";
-			label = "WP_L";
 		};
 		pg_ec_dsw_pwrok {
 			gpios = <&gpio0 4 GPIO_INPUT>;
 			enum-name = "GPIO_PG_EC_DSW_PWROK";
-			label = "PG_EC_DSW_PWROK";
 		};
 		ec_pch_wake_odl {
 			gpios = <&gpio0 5 GPIO_OUT_HIGH>;
 			enum-name = "GPIO_EC_PCH_WAKE_ODL";
-			label = "EC_PCH_WAKE_ODL";
 		};
 		/* Setup USB C1 pin as output to check their state in test */
 		usb_c1_ls_en {
 			gpios = <&gpio0 6 (GPIO_INPUT | GPIO_PULL_UP |
 					   GPIO_OUTPUT)>;
 			enum-name = "GPIO_USB_C1_LS_EN";
-			label = "USB_C1_LS_EN";
 		};
 		usb_c1_rt_rst_odl {
 			gpios = <&gpio0 7 (GPIO_OUTPUT | GPIO_INPUT)>;
 			enum-name = "GPIO_USB_C1_RT_RST_ODL";
-			label = "USB_C1_RT_RST_ODL";
 		};
 		gpio_usb_c1_frs_en: usb_c1_frs_en {
 			gpios = <&gpio0 8 (GPIO_OUT_LOW)>;
 			enum-name = "GPIO_USB_C1_FRS_EN";
-			label = "USB_C1_FRS_EN";
 		};
 		usb_c0_tcpc_int_odl: usb_c0_tcpc_int_odl {
 			gpios = <&gpio0 9 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_TCPC_INT_ODL";
-			label = "USB_C0_TCPC_INT_ODL";
 		};
 		usb_c1_tcpc_int_odl: usb_c1_tcpc_int_odl {
 			gpios = <&gpio0 10 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_TCPC_INT_ODL";
-			label = "USB_C1_TCPC_INT_ODL";
 		};
 		usb_c0_tcpc_rst_l {
 			gpios = <&gpio0 11 (GPIO_OUT_HIGH | GPIO_INPUT)>;
 			enum-name = "GPIO_USB_C0_TCPC_RST_L";
-			label = "USB_C0_TCPC_RST_L";
 		};
 		usb_c1_tcpc_rst_l {
 			gpios = <&gpio0 12 (GPIO_OUT_HIGH | GPIO_INPUT)>;
 			enum-name = "GPIO_USB_C1_TCPC_RST_L";
-			label = "USB_C1_TCPC_RST_L";
 		};
 		gpio_usb_c1_ppc_int: usb_c1_ppc_int {
 			gpios = <&gpio0 13 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C1_PPC_INT_ODL";
-			label = "GPIO_USB_C1_PPC_INT_ODL";
 		};
 		gpio_usb_c0_ppc_int: usb_c0_ppc_int {
 			gpios = <&gpio0 14 GPIO_INPUT>;
 			enum-name = "GPIO_USB_C0_PPC_INT_ODL";
-			label = "GPIO_USB_C0_PPC_INT_ODL";
 		};
 		gpio_switchcap_pg_int_l: switchcap_pg_int_l {
 			gpios = <&gpio0 15 GPIO_INPUT>;
 			enum-name = "GPIO_SWITCHCAP_PG_INT_L";
-			label = "SWITCHCAP_PG_INT_L";
 		};
 	};
 	named-i2c-ports {