From 6527122a48db5a05de3e8a69f7de6378001b6031 Mon Sep 17 00:00:00 2001 From: Fabio Baltieri Date: Mon, 25 Apr 2022 11:56:16 +0000 Subject: zephyr: shim: set a placeholder period cell for pwms property Update all pwms entries to set a period property. This is part of an ongoing standardization effort in the PWM subsystem in Zephyr, for the moment just set a "0" placeholder (it's not used by any high level driver), will followup setting it to the target value once we'll have the frequency dt macro available, and then use them in the higher level driver and deprecate the old frequency label properties on a later stage. BRANCH=none BUG=b:230093078 TEST=zmake testall Signed-off-by: Fabio Baltieri Cq-Depend: chromium:3605349, chromium:3605359 Change-Id: I38cc7ab4cbbb8a7e256a913e3c592aa7ffd55000 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3602884 Reviewed-by: Yuval Peress --- docs/zephyr/zephyr_pwm.md | 4 ++-- zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts | 4 ++-- zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml | 8 ++++---- zephyr/projects/brya/fan.dts | 2 +- zephyr/projects/brya/keyboard.dts | 2 +- zephyr/projects/brya/pwm_leds.dts | 8 ++++---- zephyr/projects/corsola/led_kingler.dts | 6 +++--- zephyr/projects/corsola/led_krabby.dts | 6 +++--- zephyr/projects/herobrine/display.dts | 2 +- zephyr/projects/herobrine/keyboard.dts | 2 +- zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts | 2 +- zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts | 2 +- zephyr/projects/nissa/nereid_keyboard.dts | 2 +- zephyr/projects/nissa/nereid_pwm_leds.dts | 6 +++--- zephyr/projects/nissa/nivviks_keyboard.dts | 2 +- zephyr/projects/nissa/nivviks_overlay.dts | 2 +- zephyr/projects/nissa/nivviks_pwm_leds.dts | 6 +++--- zephyr/projects/npcx_evb/npcx7/fan.dts | 2 +- zephyr/projects/npcx_evb/npcx7/keyboard.dts | 2 +- zephyr/projects/npcx_evb/npcx9/fan.dts | 2 +- zephyr/projects/npcx_evb/npcx9/keyboard.dts | 2 +- zephyr/projects/skyrim/fan.dts | 2 +- zephyr/projects/skyrim/keyboard.dts | 2 +- zephyr/projects/skyrim/pwm_leds.dts | 4 ++-- zephyr/projects/trogdor/lazor/display.dts | 2 +- zephyr/projects/trogdor/lazor/keyboard.dts | 2 +- zephyr/projects/trogdor/lazor/pwm_led.dts | 4 ++-- 27 files changed, 45 insertions(+), 45 deletions(-) diff --git a/docs/zephyr/zephyr_pwm.md b/docs/zephyr/zephyr_pwm.md index 95144f406e..48221dd2a6 100644 --- a/docs/zephyr/zephyr_pwm.md +++ b/docs/zephyr/zephyr_pwm.md @@ -28,7 +28,7 @@ For example for a keyboard backlight device: ``` kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm3 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; frequency = <2400>; }; ``` @@ -110,7 +110,7 @@ channel per PWM on NPCX), normal polarity: / { kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm3 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; frequency = <2400>; }; }; diff --git a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts index b0e018ba17..5b770bf71f 100644 --- a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts +++ b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts @@ -25,7 +25,7 @@ /* NOTE: &pwm number needs same with channel number */ pwm_led_test: pwm_led_test { - pwms = <&pwm0 PWM_CHANNEL_0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 PWM_CHANNEL_0 0 PWM_POLARITY_NORMAL>; }; }; @@ -155,7 +155,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm7 PWM_CHANNEL_7 PWM_POLARITY_NORMAL>; + pwms = <&pwm7 PWM_CHANNEL_7 0 PWM_POLARITY_NORMAL>; pwm-frequency = <30000>; tach = <&tach0>; rpm_min = <1500>; diff --git a/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml b/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml index 815b65742a..2b7d24d320 100644 --- a/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml +++ b/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml @@ -21,9 +21,9 @@ properties: pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm1 0 PWM_POLARITY_INVERTED - &pwm0 0 PWM_POLARITY_INVERTED - &pwm2 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm1 0 0 PWM_POLARITY_INVERTED + &pwm0 0 0 PWM_POLARITY_INVERTED + &pwm2 0 0 PWM_POLARITY_INVERTED>; }; }; @@ -42,7 +42,7 @@ properties: pwmleds { compatible = "pwm-leds"; pwm_sidesel: pwm_sidesel { - pwms = <&pwm7 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm7 0 0 PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/brya/fan.dts b/zephyr/projects/brya/fan.dts index d72fef2fad..d3032e83ec 100644 --- a/zephyr/projects/brya/fan.dts +++ b/zephyr/projects/brya/fan.dts @@ -8,7 +8,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm5 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 0 0 PWM_POLARITY_NORMAL>; pwm-frequency = <1000>; rpm_min = <2200>; rpm_start = <2200>; diff --git a/zephyr/projects/brya/keyboard.dts b/zephyr/projects/brya/keyboard.dts index fbcbeae63a..3030aee310 100644 --- a/zephyr/projects/brya/keyboard.dts +++ b/zephyr/projects/brya/keyboard.dts @@ -6,7 +6,7 @@ / { kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm3 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; frequency = <2400>; }; }; diff --git a/zephyr/projects/brya/pwm_leds.dts b/zephyr/projects/brya/pwm_leds.dts index 5d4a3992b5..ed05cfe786 100644 --- a/zephyr/projects/brya/pwm_leds.dts +++ b/zephyr/projects/brya/pwm_leds.dts @@ -7,12 +7,12 @@ pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm2 0 PWM_POLARITY_INVERTED - &pwm0 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 0 0 PWM_POLARITY_INVERTED + &pwm0 0 0 PWM_POLARITY_INVERTED>; }; pwm_led1: pwm_led_1 { - pwms = <&pwm1 0 PWM_POLARITY_INVERTED - &pwm7 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm1 0 0 PWM_POLARITY_INVERTED + &pwm7 0 0 PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/corsola/led_kingler.dts b/zephyr/projects/corsola/led_kingler.dts index 851e5778cd..5ce5186305 100644 --- a/zephyr/projects/corsola/led_kingler.dts +++ b/zephyr/projects/corsola/led_kingler.dts @@ -7,9 +7,9 @@ pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm0 0 PWM_POLARITY_INVERTED - &pwm1 0 PWM_POLARITY_INVERTED - &pwm2 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm0 0 0 PWM_POLARITY_INVERTED + &pwm1 0 0 PWM_POLARITY_INVERTED + &pwm2 0 0 PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/corsola/led_krabby.dts b/zephyr/projects/corsola/led_krabby.dts index 4a1ffa54d2..c9bf539f7f 100644 --- a/zephyr/projects/corsola/led_krabby.dts +++ b/zephyr/projects/corsola/led_krabby.dts @@ -8,13 +8,13 @@ compatible = "pwm-leds"; /* NOTE: &pwm number needs same with channel number */ led_power_white: ec_led1_odl { - pwms = <&pwm0 PWM_CHANNEL_0 PWM_POLARITY_INVERTED>; + pwms = <&pwm0 PWM_CHANNEL_0 0 PWM_POLARITY_INVERTED>; }; led_battery_amber: ec_led2_odl { - pwms = <&pwm1 PWM_CHANNEL_1 PWM_POLARITY_INVERTED>; + pwms = <&pwm1 PWM_CHANNEL_1 0 PWM_POLARITY_INVERTED>; }; led_battery_white: ec_led3_odl { - pwms = <&pwm2 PWM_CHANNEL_2 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 PWM_CHANNEL_2 0 PWM_POLARITY_INVERTED>; }; }; }; diff --git a/zephyr/projects/herobrine/display.dts b/zephyr/projects/herobrine/display.dts index bf510b03ee..d683aa931f 100644 --- a/zephyr/projects/herobrine/display.dts +++ b/zephyr/projects/herobrine/display.dts @@ -6,7 +6,7 @@ / { displight { compatible = "cros-ec,displight"; - pwms = <&pwm5 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 0 0 PWM_POLARITY_NORMAL>; frequency = <4800>; generic-pwm-channel = <1>; }; diff --git a/zephyr/projects/herobrine/keyboard.dts b/zephyr/projects/herobrine/keyboard.dts index fc16f942bc..7237e56a1f 100644 --- a/zephyr/projects/herobrine/keyboard.dts +++ b/zephyr/projects/herobrine/keyboard.dts @@ -6,7 +6,7 @@ / { kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm3 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; frequency = <10000>; generic-pwm-channel = <0>; }; diff --git a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts index b97bd6d020..233888c0ca 100644 --- a/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts +++ b/zephyr/projects/intelrvp/adlrvp/adlrvp_npcx/fan.dts @@ -8,7 +8,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm3 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; pwm-frequency = <30000>; rpm_min = <3000>; rpm_start = <3000>; diff --git a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts index ed7e229a09..66c3668fc5 100644 --- a/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts +++ b/zephyr/projects/intelrvp/mtlrvp/mtlrvpp_npcx/fan.dts @@ -8,7 +8,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm3 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; pwm-frequency = <30000>; rpm_min = <2200>; rpm_start = <2200>; diff --git a/zephyr/projects/nissa/nereid_keyboard.dts b/zephyr/projects/nissa/nereid_keyboard.dts index a020a92ba9..800681bdce 100644 --- a/zephyr/projects/nissa/nereid_keyboard.dts +++ b/zephyr/projects/nissa/nereid_keyboard.dts @@ -6,7 +6,7 @@ / { kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm0 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 0 PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/nissa/nereid_pwm_leds.dts b/zephyr/projects/nissa/nereid_pwm_leds.dts index 7cd2df01b0..f096211cb5 100644 --- a/zephyr/projects/nissa/nereid_pwm_leds.dts +++ b/zephyr/projects/nissa/nereid_pwm_leds.dts @@ -7,9 +7,9 @@ pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm1 1 PWM_POLARITY_INVERTED>, - <&pwm2 2 PWM_POLARITY_INVERTED>, - <&pwm3 3 PWM_POLARITY_INVERTED>; + pwms = <&pwm1 1 0 PWM_POLARITY_INVERTED>, + <&pwm2 2 0 PWM_POLARITY_INVERTED>, + <&pwm3 3 0 PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/nissa/nivviks_keyboard.dts b/zephyr/projects/nissa/nivviks_keyboard.dts index b1b4b5af8b..7fc6fcd125 100644 --- a/zephyr/projects/nissa/nivviks_keyboard.dts +++ b/zephyr/projects/nissa/nivviks_keyboard.dts @@ -6,7 +6,7 @@ / { kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm6 6 PWM_POLARITY_NORMAL>; + pwms = <&pwm6 6 0 PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks_overlay.dts index 80fb01693f..48b395d7f0 100644 --- a/zephyr/projects/nissa/nivviks_overlay.dts +++ b/zephyr/projects/nissa/nivviks_overlay.dts @@ -221,7 +221,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm5 5 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 5 0 PWM_POLARITY_NORMAL>; pwm-frequency = <1000>; rpm_min = <2200>; rpm_start = <2200>; diff --git a/zephyr/projects/nissa/nivviks_pwm_leds.dts b/zephyr/projects/nissa/nivviks_pwm_leds.dts index 36a5a5b461..5fb301bfa5 100644 --- a/zephyr/projects/nissa/nivviks_pwm_leds.dts +++ b/zephyr/projects/nissa/nivviks_pwm_leds.dts @@ -7,9 +7,9 @@ pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm2 2 PWM_POLARITY_INVERTED>, - <&pwm0 0 PWM_POLARITY_INVERTED>, - <&pwm1 1 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 2 0 PWM_POLARITY_INVERTED>, + <&pwm0 0 0 PWM_POLARITY_INVERTED>, + <&pwm1 1 0 PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/npcx_evb/npcx7/fan.dts b/zephyr/projects/npcx_evb/npcx7/fan.dts index d77c24bda3..90b6bcb257 100644 --- a/zephyr/projects/npcx_evb/npcx7/fan.dts +++ b/zephyr/projects/npcx_evb/npcx7/fan.dts @@ -8,7 +8,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm0 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 0 PWM_POLARITY_NORMAL>; pwm-frequency = <25000>; rpm_min = <1000>; rpm_start = <1000>; diff --git a/zephyr/projects/npcx_evb/npcx7/keyboard.dts b/zephyr/projects/npcx_evb/npcx7/keyboard.dts index 8c3d44d66e..f9e45d6e80 100644 --- a/zephyr/projects/npcx_evb/npcx7/keyboard.dts +++ b/zephyr/projects/npcx_evb/npcx7/keyboard.dts @@ -31,7 +31,7 @@ kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm2 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm2 0 0 PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/npcx_evb/npcx9/fan.dts b/zephyr/projects/npcx_evb/npcx9/fan.dts index d77c24bda3..90b6bcb257 100644 --- a/zephyr/projects/npcx_evb/npcx9/fan.dts +++ b/zephyr/projects/npcx_evb/npcx9/fan.dts @@ -8,7 +8,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm0 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 0 PWM_POLARITY_NORMAL>; pwm-frequency = <25000>; rpm_min = <1000>; rpm_start = <1000>; diff --git a/zephyr/projects/npcx_evb/npcx9/keyboard.dts b/zephyr/projects/npcx_evb/npcx9/keyboard.dts index 8c3d44d66e..f9e45d6e80 100644 --- a/zephyr/projects/npcx_evb/npcx9/keyboard.dts +++ b/zephyr/projects/npcx_evb/npcx9/keyboard.dts @@ -31,7 +31,7 @@ kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm2 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm2 0 0 PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/skyrim/fan.dts b/zephyr/projects/skyrim/fan.dts index cc059a8aa6..1e784992f2 100644 --- a/zephyr/projects/skyrim/fan.dts +++ b/zephyr/projects/skyrim/fan.dts @@ -8,7 +8,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm0 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 0 PWM_POLARITY_NORMAL>; pwm-frequency = <25000>; rpm_min = <1000>; rpm_start = <1000>; diff --git a/zephyr/projects/skyrim/keyboard.dts b/zephyr/projects/skyrim/keyboard.dts index 6153e19d01..b574a6d97e 100644 --- a/zephyr/projects/skyrim/keyboard.dts +++ b/zephyr/projects/skyrim/keyboard.dts @@ -6,7 +6,7 @@ / { kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm1 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm1 0 0 PWM_POLARITY_NORMAL>; frequency = <100>; }; }; diff --git a/zephyr/projects/skyrim/pwm_leds.dts b/zephyr/projects/skyrim/pwm_leds.dts index 951edb0f09..44bdc8bba6 100644 --- a/zephyr/projects/skyrim/pwm_leds.dts +++ b/zephyr/projects/skyrim/pwm_leds.dts @@ -7,8 +7,8 @@ pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm2 0 PWM_POLARITY_INVERTED - &pwm3 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 0 0 PWM_POLARITY_INVERTED + &pwm3 0 0 PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/trogdor/lazor/display.dts b/zephyr/projects/trogdor/lazor/display.dts index bf510b03ee..d683aa931f 100644 --- a/zephyr/projects/trogdor/lazor/display.dts +++ b/zephyr/projects/trogdor/lazor/display.dts @@ -6,7 +6,7 @@ / { displight { compatible = "cros-ec,displight"; - pwms = <&pwm5 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 0 0 PWM_POLARITY_NORMAL>; frequency = <4800>; generic-pwm-channel = <1>; }; diff --git a/zephyr/projects/trogdor/lazor/keyboard.dts b/zephyr/projects/trogdor/lazor/keyboard.dts index 32218f9c56..5a931c48b1 100644 --- a/zephyr/projects/trogdor/lazor/keyboard.dts +++ b/zephyr/projects/trogdor/lazor/keyboard.dts @@ -26,7 +26,7 @@ kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm3 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; frequency = <10000>; generic-pwm-channel = <0>; }; diff --git a/zephyr/projects/trogdor/lazor/pwm_led.dts b/zephyr/projects/trogdor/lazor/pwm_led.dts index 6f3205ee50..0450c907af 100644 --- a/zephyr/projects/trogdor/lazor/pwm_led.dts +++ b/zephyr/projects/trogdor/lazor/pwm_led.dts @@ -9,12 +9,12 @@ pwm_y: pwm_y { #led-pin-cells = <1>; - pwms = <&pwm0 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 0 PWM_POLARITY_NORMAL>; }; pwm_b: pwm_b { #led-pin-cells = <1>; - pwms = <&pwm2 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm2 0 0 PWM_POLARITY_NORMAL>; }; }; -- cgit v1.2.1