zephyr: leds: move led value in the pwm led binding

Similarly to the gpio led binding, the pwm led binding is using phandle
cells as values. Fix up the code to use a separate property instead, at
this point the -config binding is not needed anymore and we can use the
upstream pwm-leds directly.

BRANCH=none
BUG=b:242826402
TEST=validated the resulting structure with gdb
TEST=zmake build -a; ./twister

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Iec480da15e2ff5e356bad11fbfb6031d4d56353a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4031269
Reviewed-by: Sam Hurst <shurst@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>

14 files changed, 106 insertions, 164 deletions

diff --git a/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml b/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml
index 19fee69be4..5ee8e112b5 100644
--- a/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml
+++ b/zephyr/dts/bindings/leds/cros-ec,pwm-led-pins.yaml
@@ -14,8 +14,8 @@ child-binding:
       looks like this where 100 is PWM duty cycle in percentage.
       color-amber {
                    led-color = "LED_AMBER";
-                   led-pins = <&pwm_led_y 100>,
-                              <&pwm_led_b 0>;
+                   led-pwms = <&pwm_led_y &pwm_led_b>;
+                   led-values = <100 0>;
                   };
     properties:
         led-color:
@@ -59,11 +59,16 @@ child-binding:
                 - EC_LED_COLOR_YELLOW
                 - EC_LED_COLOR_WHITE
                 - EC_LED_COLOR_AMBER
-        led-pins:
-            type: phandle-array
+        led-pwms:
+            type: phandles
             required: true
             description: |
-              This property is used to specify an array of PWM pins and
-              corresponding values to enable a particular color.
-              e.g. Amber color - led-pins = <&pwm_led_y 100>,
-                                            <&pwm_led_b 0>;
+              This property is used to specify an array of pwms to set a
+              particular color.
+
+        led-values:
+            type: array
+            required: true
+            description: |
+              This property is used to specify an array of values to set on the
+              corresponding pwm-pins to set a particular color.
diff --git a/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml b/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml
deleted file mode 100644
index bdef6b6144..0000000000
--- a/zephyr/dts/bindings/leds/cros-ec,pwm-pin-config.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2022 The ChromiumOS Authors
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-description: PWM LED pin configuration
-
-compatible: "cros-ec,pwm-pin-config"
-
-child-binding:
-  description: PWMs associated with LEDs
-  properties:
-    pwms:
-      type: phandle-array
-      required: true
-    "#led-pin-cells":
-      type: int
-      required: false
-  led-pin-cells:
-    - value
diff --git a/zephyr/program/corsola/led_it81202_base.dtsi b/zephyr/program/corsola/led_it81202_base.dtsi
index 2703e6c997..582af0b092 100644
--- a/zephyr/program/corsola/led_it81202_base.dtsi
+++ b/zephyr/program/corsola/led_it81202_base.dtsi
@@ -92,29 +92,17 @@
 	};
 
 	pwmleds {
-		compatible = "cros-ec,pwm-pin-config";
+		compatible = "pwm-leds";
 
 		/* NOTE: &pwm number needs same with channel number */
 		led_power_white: ec_led1_odl {
-			#led-pin-cells = <1>;
-			pwms = <&pwm0
-				PWM_CHANNEL_0
-				PWM_HZ(324)
-				PWM_POLARITY_INVERTED>;
+			pwms = <&pwm0 PWM_CHANNEL_0 PWM_HZ(324) PWM_POLARITY_INVERTED>;
 		};
 		led_battery_amber: ec_led2_odl {
-			#led-pin-cells = <1>;
-			pwms = <&pwm1
-				PWM_CHANNEL_1
-				PWM_HZ(324)
-				PWM_POLARITY_INVERTED>;
+			pwms = <&pwm1 PWM_CHANNEL_1 PWM_HZ(324) PWM_POLARITY_INVERTED>;
 		};
 		led_battery_white: ec_led3_odl {
-			#led-pin-cells = <1>;
-			pwms = <&pwm2
-				PWM_CHANNEL_2
-				PWM_HZ(324)
-				PWM_POLARITY_INVERTED>;
+			pwms = <&pwm2 PWM_CHANNEL_2 PWM_HZ(324) PWM_POLARITY_INVERTED>;
 		};
 	};
 
@@ -124,37 +112,39 @@
 		color_power_off: color-power-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_POWER_LED";
-			led-pins = <&led_power_white 0>;
+			led-pwms = <&led_power_white>;
+			led-values = <0>;
 		};
 
 		color_power_white: color-power-white {
 			led-color = "LED_WHITE";
 			br-color = "EC_LED_COLOR_WHITE";
 			led-id = "EC_LED_ID_POWER_LED";
-			led-pins = <&led_power_white 100>;
+			led-pwms = <&led_power_white>;
+			led-values = <100>;
 		};
 
 		color_battery_off: color-battery-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&led_battery_amber 0>,
-				   <&led_battery_white 0>;
+			led-pwms = <&led_battery_amber &led_battery_white>;
+			led-values = <0 0>;
 		};
 
 		color_battery_amber: color-battery-amber {
 			led-color = "LED_AMBER";
 			br-color = "EC_LED_COLOR_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&led_battery_amber 100>,
-				   <&led_battery_white 0>;
+			led-pwms = <&led_battery_amber &led_battery_white>;
+			led-values = <100 0>;
 		};
 
 		color_battery_white: color-battery-white {
 			led-color = "LED_WHITE";
 			br-color = "EC_LED_COLOR_WHITE";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&led_battery_amber 0>,
-				   <&led_battery_white 100>;
+			led-pwms = <&led_battery_amber &led_battery_white>;
+			led-values = <0 100>;
 		};
 	};
 };
diff --git a/zephyr/program/corsola/led_magikarp.dtsi b/zephyr/program/corsola/led_magikarp.dtsi
index 01382d95c0..f8b53a42ec 100644
--- a/zephyr/program/corsola/led_magikarp.dtsi
+++ b/zephyr/program/corsola/led_magikarp.dtsi
@@ -130,7 +130,8 @@
 		color_power_white: color-power-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_POWER_LED";
-			led-pins = <&led_power_white 0>;
+			led-pwms = <&led_power_white>;
+			led-values = <0>;
 		};
 	};
 };
diff --git a/zephyr/program/corsola/led_tentacruel.dtsi b/zephyr/program/corsola/led_tentacruel.dtsi
index 39197bd51d..05d49371af 100644
--- a/zephyr/program/corsola/led_tentacruel.dtsi
+++ b/zephyr/program/corsola/led_tentacruel.dtsi
@@ -112,7 +112,8 @@
 		color_power_white: color-power-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_POWER_LED";
-			led-pins = <&led_power_white 0>;
+			led-pwms = <&led_power_white>;
+			led-values = <0>;
 		};
 	};
 };
diff --git a/zephyr/program/nissa/xivu/led_pins.dtsi b/zephyr/program/nissa/xivu/led_pins.dtsi
index d85004a0c9..e8c0738efd 100644
--- a/zephyr/program/nissa/xivu/led_pins.dtsi
+++ b/zephyr/program/nissa/xivu/led_pins.dtsi
@@ -4,25 +4,18 @@
  */
 
 / {
-	pwm_pins {
-		compatible = "cros-ec,pwm-pin-config";
+	pwmleds {
+		compatible = "pwm-leds";
 		pwm_led_y_c0: pwm_led_y_c0 {
-			#led-pin-cells = <1>;
 			pwms = <&pwm2 0 PWM_HZ(324) PWM_POLARITY_INVERTED>;
 		};
-
 		pwm_led_w_c0: pwm_led_w_c0 {
-			#led-pin-cells = <1>;
 			pwms = <&pwm0 0 PWM_HZ(324) PWM_POLARITY_INVERTED>;
 		};
-
 		pwm_led_y_c1: pwm_led_y_c1 {
-			#led-pin-cells = <1>;
 			pwms = <&pwm6 0 PWM_HZ(324) PWM_POLARITY_INVERTED>;
 		};
-
 		pwm_led_w_c1: pwm_led_w_c1 {
-			#led-pin-cells = <1>;
 			pwms = <&pwm1 0 PWM_HZ(324) PWM_POLARITY_INVERTED>;
 		};
 	};
@@ -33,30 +26,27 @@
 		color_off: color-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&pwm_led_y_c0 0>,
-				   <&pwm_led_y_c1 0>,
-				   <&pwm_led_w_c0 0>,
-				   <&pwm_led_w_c1 0>;
+			led-pwms = <&pwm_led_y_c0 &pwm_led_y_c1
+				    &pwm_led_w_c0 &pwm_led_w_c1>;
+			led-values = <0 0 0 0>;
 		};
 
 		color_amber: color-amber {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwm_led_y_c0 1>,
-				   <&pwm_led_y_c1 1>,
-				   <&pwm_led_w_c0 0>,
-				   <&pwm_led_w_c1 0>;
+			led-pwms = <&pwm_led_y_c0 &pwm_led_y_c1
+				    &pwm_led_w_c0 &pwm_led_w_c1>;
+			led-values = <1 1 0 0>;
 		};
 
 		color_white: color-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwm_led_y_c0 0>,
-				   <&pwm_led_y_c1 0>,
-				   <&pwm_led_w_c0 1>,
-				   <&pwm_led_w_c1 1>;
+			led-pwms = <&pwm_led_y_c0 &pwm_led_y_c1
+				    &pwm_led_w_c0 &pwm_led_w_c1>;
+			led-values = <0 0 1 1>;
 		};
 	};
 };
diff --git a/zephyr/program/skyrim/led_pins_crystaldrift.dts b/zephyr/program/skyrim/led_pins_crystaldrift.dts
index d294490208..f778a24a51 100644
--- a/zephyr/program/skyrim/led_pins_crystaldrift.dts
+++ b/zephyr/program/skyrim/led_pins_crystaldrift.dts
@@ -4,16 +4,14 @@
  */
 
 / {
-	pwm_pins {
-		compatible = "cros-ec,pwm-pin-config";
+	pwmleds {
+		compatible = "pwm-leds";
 
 		pwm_y: pwm_y {
-			#led-pin-cells = <1>;
 			pwms = <&pwm2 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
 
 		pwm_w: pwm_w {
-			#led-pin-cells = <1>;
 			pwms = <&pwm3 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
 	};
@@ -24,24 +22,24 @@
 		color_off: color-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 0>;
 		};
 
 		color_amber: color-amber {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwm_y 100>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <100 0>;
 		};
 
 		color_white: color-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 100>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 100>;
 		};
 	};
 };
diff --git a/zephyr/program/skyrim/led_pins_frostflow.dts b/zephyr/program/skyrim/led_pins_frostflow.dts
index d294490208..78b9a59c40 100644
--- a/zephyr/program/skyrim/led_pins_frostflow.dts
+++ b/zephyr/program/skyrim/led_pins_frostflow.dts
@@ -4,16 +4,12 @@
  */
 
 / {
-	pwm_pins {
-		compatible = "cros-ec,pwm-pin-config";
-
+	pwmleds {
+		compatible = "pwm-leds";
 		pwm_y: pwm_y {
-			#led-pin-cells = <1>;
 			pwms = <&pwm2 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
-
 		pwm_w: pwm_w {
-			#led-pin-cells = <1>;
 			pwms = <&pwm3 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
 	};
@@ -24,24 +20,24 @@
 		color_off: color-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 0>;
 		};
 
 		color_amber: color-amber {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwm_y 100>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <100 0>;
 		};
 
 		color_white: color-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 100>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 100>;
 		};
 	};
 };
diff --git a/zephyr/program/skyrim/led_pins_morthal.dts b/zephyr/program/skyrim/led_pins_morthal.dts
index d294490208..78b9a59c40 100644
--- a/zephyr/program/skyrim/led_pins_morthal.dts
+++ b/zephyr/program/skyrim/led_pins_morthal.dts
@@ -4,16 +4,12 @@
  */
 
 / {
-	pwm_pins {
-		compatible = "cros-ec,pwm-pin-config";
-
+	pwmleds {
+		compatible = "pwm-leds";
 		pwm_y: pwm_y {
-			#led-pin-cells = <1>;
 			pwms = <&pwm2 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
-
 		pwm_w: pwm_w {
-			#led-pin-cells = <1>;
 			pwms = <&pwm3 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
 	};
@@ -24,24 +20,24 @@
 		color_off: color-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 0>;
 		};
 
 		color_amber: color-amber {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwm_y 100>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <100 0>;
 		};
 
 		color_white: color-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 100>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 100>;
 		};
 	};
 };
diff --git a/zephyr/program/skyrim/led_pins_skyrim.dts b/zephyr/program/skyrim/led_pins_skyrim.dts
index d294490208..78b9a59c40 100644
--- a/zephyr/program/skyrim/led_pins_skyrim.dts
+++ b/zephyr/program/skyrim/led_pins_skyrim.dts
@@ -4,16 +4,12 @@
  */
 
 / {
-	pwm_pins {
-		compatible = "cros-ec,pwm-pin-config";
-
+	pwmleds {
+		compatible = "pwm-leds";
 		pwm_y: pwm_y {
-			#led-pin-cells = <1>;
 			pwms = <&pwm2 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
-
 		pwm_w: pwm_w {
-			#led-pin-cells = <1>;
 			pwms = <&pwm3 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
 	};
@@ -24,24 +20,24 @@
 		color_off: color-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 0>;
 		};
 
 		color_amber: color-amber {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwm_y 100>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <100 0>;
 		};
 
 		color_white: color-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 100>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 100>;
 		};
 	};
 };
diff --git a/zephyr/program/skyrim/led_pins_winterhold.dts b/zephyr/program/skyrim/led_pins_winterhold.dts
index d294490208..78b9a59c40 100644
--- a/zephyr/program/skyrim/led_pins_winterhold.dts
+++ b/zephyr/program/skyrim/led_pins_winterhold.dts
@@ -4,16 +4,12 @@
  */
 
 / {
-	pwm_pins {
-		compatible = "cros-ec,pwm-pin-config";
-
+	pwmleds {
+		compatible = "pwm-leds";
 		pwm_y: pwm_y {
-			#led-pin-cells = <1>;
 			pwms = <&pwm2 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
-
 		pwm_w: pwm_w {
-			#led-pin-cells = <1>;
 			pwms = <&pwm3 0 PWM_HZ(100) PWM_POLARITY_INVERTED>;
 		};
 	};
@@ -24,24 +20,24 @@
 		color_off: color-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 0>;
 		};
 
 		color_amber: color-amber {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwm_y 100>,
-				   <&pwm_w 0>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <100 0>;
 		};
 
 		color_white: color-white {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_w 100>;
+			led-pwms = <&pwm_y &pwm_w>;
+			led-values = <0 100>;
 		};
 	};
 };
diff --git a/zephyr/program/trogdor/lazor/pwm_led.dts b/zephyr/program/trogdor/lazor/pwm_led.dts
index 0582966d6a..f8375b3596 100644
--- a/zephyr/program/trogdor/lazor/pwm_led.dts
+++ b/zephyr/program/trogdor/lazor/pwm_led.dts
@@ -4,16 +4,12 @@
  */
 
 / {
-	pwm_pins {
-		compatible = "cros-ec,pwm-pin-config";
-
+	pwmleds {
+		compatible = "pwm-leds";
 		pwm_y: pwm_y {
-			#led-pin-cells = <1>;
 			pwms = <&pwm0 0 PWM_HZ(324) PWM_POLARITY_NORMAL>;
 		};
-
 		pwm_b: pwm_b {
-			#led-pin-cells = <1>;
 			pwms = <&pwm2 0 PWM_HZ(324) PWM_POLARITY_NORMAL>;
 		};
 	};
@@ -24,24 +20,24 @@
 		color_off: color-off {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_BATTERY_LED";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_b 0>;
+			led-pwms = <&pwm_y &pwm_b>;
+			led-values = <0 0>;
 		};
 
 		color_amber: color-amber {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwm_y 100>,
-				   <&pwm_b 0>;
+			led-pwms = <&pwm_y &pwm_b>;
+			led-values = <100 0>;
 		};
 
 		color_blue: color-blue {
 			led-color = "LED_BLUE";
 			led-id = "EC_LED_ID_BATTERY_LED";
 			br-color = "EC_LED_COLOR_BLUE";
-			led-pins = <&pwm_y 0>,
-				   <&pwm_b 100>;
+			led-pwms = <&pwm_y &pwm_b>;
+			led-values = <0 100>;
 		};
 	};
 };
diff --git a/zephyr/shim/src/led_driver/led_pwm.c b/zephyr/shim/src/led_driver/led_pwm.c
index cfb0d13fb4..dbf98bc3b4 100644
--- a/zephyr/shim/src/led_driver/led_pwm.c
+++ b/zephyr/shim/src/led_driver/led_pwm.c
@@ -33,12 +33,12 @@ LOG_MODULE_REGISTER(pwm_led, LOG_LEVEL_ERR);
 		.pwm = PWM_DT_SPEC_GET(DT_PHANDLE_BY_IDX(node_id, prop, i)),  \
 		.pulse_ns = DIV_ROUND_NEAREST(                                \
 			DT_PWMS_PERIOD(DT_PHANDLE_BY_IDX(node_id, prop, i)) * \
-				DT_PHA_BY_IDX(node_id, prop, i, value),       \
+				DT_PROP_BY_IDX(node_id, led_values, i),       \
 			100),                                                 \
 	},
 
 #define SET_PWM_PIN(node_id) \
-	{ DT_FOREACH_PROP_ELEM(node_id, led_pins, SET_PIN) };
+	{ DT_FOREACH_PROP_ELEM(node_id, led_pwms, SET_PIN) };
 
 #define GEN_PINS_ARRAY(id) struct pwm_pin_t PINS_ARRAY(id)[] = SET_PWM_PIN(id)
 
@@ -49,7 +49,7 @@ DT_FOREACH_CHILD(PWM_LED_PINS_NODE, GEN_PINS_ARRAY)
 	  .led_id = GET_PROP(node_id, led_id),         \
 	  .br_color = GET_PROP_NVE(node_id, br_color), \
 	  .pwm_pins = PINS_ARRAY(node_id),             \
-	  .pins_count = DT_PROP_LEN(node_id, led_pins) };
+	  .pins_count = DT_PROP_LEN(node_id, led_pwms) };
 
 /*
  * Initialize led_pins_node_t struct for each pin node defined
diff --git a/zephyr/test/drivers/boards/native_posix.overlay b/zephyr/test/drivers/boards/native_posix.overlay
index b077cd984c..fa427c30f5 100644
--- a/zephyr/test/drivers/boards/native_posix.overlay
+++ b/zephyr/test/drivers/boards/native_posix.overlay
@@ -970,22 +970,18 @@
 	};
 
 	pwmleds {
-		compatible = "cros-ec,pwm-pin-config";
+		compatible = "pwm-leds";
 
 		pwmled_blue_left: pwmled_b_left {
-			#led-pin-cells = <1>;
 			pwms = <&pwm_blue_left 0 1000000 PWM_POLARITY_NORMAL>;
 		};
 		pwmled_white_left: pwmled_w_left {
-			#led-pin-cells = <1>;
 			pwms = <&pwm_white_left 0 1000000 PWM_POLARITY_NORMAL>;
 		};
 		pwmled_amber_right: pwmled_y_right {
-			#led-pin-cells = <1>;
 			pwms = <&pwm_amber_right 0 1000000 PWM_POLARITY_NORMAL>;
 		};
 		pwmled_white_right: pwmled_w_right {
-			#led-pin-cells = <1>;
 			pwms = <&pwm_white_right 0 1000000 PWM_POLARITY_NORMAL>;
 		};
 	};
@@ -996,42 +992,42 @@
 		color-off-left {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_LEFT_LED";
-			led-pins = <&pwmled_blue_left 0>,
-				   <&pwmled_white_left 0>;
+			led-pwms = <&pwmled_blue_left &pwmled_white_left>;
+			led-values = <0 0>;
 		};
 		color-off-right {
 			led-color = "LED_OFF";
 			led-id = "EC_LED_ID_RIGHT_LED";
-			led-pins = <&pwmled_amber_right 0>,
-				   <&pwmled_white_right 0>;
+			led-pwms = <&pwmled_amber_right &pwmled_white_right>;
+			led-values = <0 0>;
 		};
 		color-blue-left {
 			led-color = "LED_BLUE";
 			led-id = "EC_LED_ID_LEFT_LED";
 			br-color = "EC_LED_COLOR_BLUE";
-			led-pins = <&pwmled_blue_left 100>,
-				   <&pwmled_white_left 0>;
+			led-pwms = <&pwmled_blue_left &pwmled_white_left>;
+			led-values = <100 0>;
 		};
 		color-amber-right {
 			led-color = "LED_AMBER";
 			led-id = "EC_LED_ID_RIGHT_LED";
 			br-color = "EC_LED_COLOR_AMBER";
-			led-pins = <&pwmled_amber_right 100>,
-				   <&pwmled_white_right 0>;
+			led-pwms = <&pwmled_amber_right &pwmled_white_right>;
+			led-values = <100 0>;
 		};
 		color-white-left {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_LEFT_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwmled_blue_left 0>,
-				   <&pwmled_white_left 100>;
+			led-pwms = <&pwmled_blue_left &pwmled_white_left>;
+			led-values = <0 100>;
 		};
 		color-white-right {
 			led-color = "LED_WHITE";
 			led-id = "EC_LED_ID_RIGHT_LED";
 			br-color = "EC_LED_COLOR_WHITE";
-			led-pins = <&pwmled_amber_right 0>,
-				   <&pwmled_white_right 100>;
+			led-pwms = <&pwmled_amber_right &pwmled_white_right>;
+			led-values = <0 100>;
 		};
 	};