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

Label property for named-pwm nodes is unused sice:

dcf34010e2 zephyr: use node name for gpio and pwm structures

Drop the label property from most board dts files, and 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: I906ec8010a5bed5c14972e39253ce1a13105fcd6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3362466
Reviewed-by: Sam Hurst <shurst@google.com>

9 files changed, 20 insertions, 40 deletions

diff --git a/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9.dts b/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9.dts
index e510d57a09..2103b59c1d 100644
--- a/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9.dts
+++ b/zephyr/boards/arm/herobrine_npcx9/herobrine_npcx9.dts
@@ -50,14 +50,12 @@
 	named-pwms {
 		compatible = "named-pwms";
 
-		kblight: kblight {
+		kblight: kb_bl_pwm {
 			pwms = <&pwm3 0 0>;
-			label = "KBLIGHT";
 			frequency = <10000>;
 		};
-		displight: displight {
+		displight: ecl_bl_pwm_r {
 			pwms = <&pwm5 0 0>;
-			label = "DISPLIGHT";
 			frequency = <4800>;
 		};
 	};
diff --git a/zephyr/boards/arm/trogdor/trogdor.dts b/zephyr/boards/arm/trogdor/trogdor.dts
index 0b99006e7d..3b9c6178e8 100644
--- a/zephyr/boards/arm/trogdor/trogdor.dts
+++ b/zephyr/boards/arm/trogdor/trogdor.dts
@@ -102,14 +102,12 @@
 	named-pwms {
 		compatible = "named-pwms";
 
-		kblight: kblight {
+		kblight: kb_bl_pwm {
 			pwms = <&pwm3 0 0>;
-			label = "KBLIGHT";
 			frequency = <10000>;
 		};
-		displight: displight {
+		displight: edp_bkltctl {
 			pwms = <&pwm5 0 0>;
-			label = "DISPLIGHT";
 			frequency = <4800>;
 		};
 	};
diff --git a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts
index 542ecc5d66..ffdcc09083 100644
--- a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts
+++ b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts
@@ -174,7 +174,6 @@
 		/* NOTE: &pwm number needs same with channel number */
 		pwm_test: test {
 			pwms = <&pwm0 PWM_CHANNEL_0 PWM_POLARITY_NORMAL>;
-			label = "TEST";
 			/*
 			 * If we need pwm output in ITE chip power saving
 			 * mode, then we should set frequency <=324Hz.
@@ -183,7 +182,6 @@
 		};
 		pwm_fan: fan {
 			pwms = <&pwm7 PWM_CHANNEL_7 PWM_POLARITY_NORMAL>;
-			label = "FAN";
 			frequency = <30000>;
 		};
 	};
diff --git a/zephyr/projects/asurada/hayato/pwm.dts b/zephyr/projects/asurada/hayato/pwm.dts
index f86448cc8e..3aba3b7f3c 100644
--- a/zephyr/projects/asurada/hayato/pwm.dts
+++ b/zephyr/projects/asurada/hayato/pwm.dts
@@ -7,26 +7,23 @@
 	named-pwms {
 		compatible = "named-pwms";
 		/* NOTE: &pwm number needs same with channel number */
-		led1: led1 {
+		led1: led1_sub_odl {
 			#pwm-cells = <0>;
 			pwms = <&pwm0 PWM_CHANNEL_0 PWM_POLARITY_INVERTED>;
-			label = "LED1";
 			/*
 			 * If we need pwm output in ITE chip power saving
 			 * mode, then we should set frequency <=324Hz.
 			 */
 			frequency = <324>;
 		};
-		led2: led2 {
+		led2: led2_sub_odl {
 			#pwm-cells = <0>;
 			pwms = <&pwm1 PWM_CHANNEL_1 PWM_POLARITY_INVERTED>;
-			label = "LED2";
 			frequency = <324>;
 		};
-		led3: led3 {
+		led3: led3_sub_odl {
 			#pwm-cells = <0>;
 			pwms = <&pwm2 PWM_CHANNEL_2 PWM_POLARITY_INVERTED>;
-			label = "LED3";
 			frequency = <324>;
 		};
 	};
diff --git a/zephyr/projects/corsola/pwm_krabby.dts b/zephyr/projects/corsola/pwm_krabby.dts
index f86448cc8e..40eb8f5048 100644
--- a/zephyr/projects/corsola/pwm_krabby.dts
+++ b/zephyr/projects/corsola/pwm_krabby.dts
@@ -7,26 +7,23 @@
 	named-pwms {
 		compatible = "named-pwms";
 		/* NOTE: &pwm number needs same with channel number */
-		led1: led1 {
+		led1: ec_led1_odl {
 			#pwm-cells = <0>;
 			pwms = <&pwm0 PWM_CHANNEL_0 PWM_POLARITY_INVERTED>;
-			label = "LED1";
 			/*
 			 * If we need pwm output in ITE chip power saving
 			 * mode, then we should set frequency <=324Hz.
 			 */
 			frequency = <324>;
 		};
-		led2: led2 {
+		led2: ec_led2_odl {
 			#pwm-cells = <0>;
 			pwms = <&pwm1 PWM_CHANNEL_1 PWM_POLARITY_INVERTED>;
-			label = "LED2";
 			frequency = <324>;
 		};
-		led3: led3 {
+		led3: ec_led3_odl {
 			#pwm-cells = <0>;
 			pwms = <&pwm2 PWM_CHANNEL_2 PWM_POLARITY_INVERTED>;
-			label = "LED3";
 			frequency = <324>;
 		};
 	};
diff --git a/zephyr/projects/npcx_evb/npcx7/pwm.dts b/zephyr/projects/npcx_evb/npcx7/pwm.dts
index 73312f684c..448fc53f7a 100644
--- a/zephyr/projects/npcx_evb/npcx7/pwm.dts
+++ b/zephyr/projects/npcx_evb/npcx7/pwm.dts
@@ -9,12 +9,10 @@
 
 		pwm_fan: fan {
 			pwms = <&pwm0 0 0>;
-			label = "FAN";
 			frequency = <25000>;
 		};
 		kblight: kblight {
 			pwms = <&pwm2 0 0>;
-			label = "KBLIGHT";
 			frequency = <10000>;
 		};
 	};
diff --git a/zephyr/projects/npcx_evb/npcx9/pwm.dts b/zephyr/projects/npcx_evb/npcx9/pwm.dts
index 73312f684c..448fc53f7a 100644
--- a/zephyr/projects/npcx_evb/npcx9/pwm.dts
+++ b/zephyr/projects/npcx_evb/npcx9/pwm.dts
@@ -9,12 +9,10 @@
 
 		pwm_fan: fan {
 			pwms = <&pwm0 0 0>;
-			label = "FAN";
 			frequency = <25000>;
 		};
 		kblight: kblight {
 			pwms = <&pwm2 0 0>;
-			label = "KBLIGHT";
 			frequency = <10000>;
 		};
 	};
diff --git a/zephyr/projects/skyrim/pwm.dts b/zephyr/projects/skyrim/pwm.dts
index dd9fc94eaa..8853615074 100644
--- a/zephyr/projects/skyrim/pwm.dts
+++ b/zephyr/projects/skyrim/pwm.dts
@@ -7,24 +7,20 @@
 	named-pwms {
 		compatible = "named-pwms";
 
-		pwm_fan: fan {
+		pwm_fan: ec_fan_pwm {
 			pwms = <&pwm0 0 0>;
-			label = "FAN";
 			frequency = <25000>;
 		};
-		kblight: kblight {
+		kblight: pwm_kb_bl {
 			pwms = <&pwm1 0 0>;
-			label = "KBLIGHT";
 			frequency = <100>;
 		};
-		led_charge: led_charge {
+		led_charge: ec_pwm_led_chrg_l {
 			pwms = <&pwm2 0 0>;
-			label = "LED_CHARGE";
 			frequency = <100>;
 		};
-		led_full: led_full {
+		led_full: ec_pwm_led_full_l {
 			pwms = <&pwm3 0 0>;
-			label = "LED_FULL";
 			frequency = <100>;
 		};
 	};
diff --git a/zephyr/projects/volteer/volteer/pwm.dts b/zephyr/projects/volteer/volteer/pwm.dts
index 940e3d1527..c551280262 100644
--- a/zephyr/projects/volteer/volteer/pwm.dts
+++ b/zephyr/projects/volteer/volteer/pwm.dts
@@ -7,31 +7,31 @@
 	named-pwms {
 		compatible = "named-pwms";
 
-		led1_blue: led1_blue {
+		led1_blue: led_1_l {
 			#pwm-cells = <0>;
 			pwms = <&pwm2 0 PWM_POLARITY_INVERTED>;
 			frequency = <4800>;
 		};
-		led2_green: led2_green  {
+		led2_green: led_2_l  {
 			#pwm-cells = <0>;
 			pwms = <&pwm0 0 PWM_POLARITY_INVERTED>;
 			frequency = <4800>;
 		};
-		led3_red: led3_red {
+		led3_red: led_3_l {
 			#pwm-cells = <0>;
 			pwms = <&pwm1 0 PWM_POLARITY_INVERTED>;
 			frequency = <4800>;
 		};
-		led3_sidesel: led3_sidesel {
+		led3_sidesel: led_sidesel_4_l {
 			#pwm-cells = <0>;
 			pwms = <&pwm7 0 PWM_POLARITY_INVERTED>;
 			frequency = <2400>;
 		};
-		kblight: kblight {
+		kblight: ec_kb_bl_pwm {
 			pwms = <&pwm3 0 0>;
 			frequency = <2400>;
 		};
-		pwm_fan: fan {
+		pwm_fan: fan_pwm {
 			pwms = <&pwm5 0 0>;
 			frequency = <25000>;
 		};