diff options
author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-04-22 17:29:29 +0000 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-04-28 23:03:10 +0000 |
commit | d2e7a65e711220ca1faab4b815b0cf9244ca9ced (patch) | |
tree | 602480c9f1aee79eff9070b412d0fba20fdc84ef | |
parent | a2d94bbed5e089b21447bbb58dc47ba02dce8e36 (diff) | |
download | chrome-ec-d2e7a65e711220ca1faab4b815b0cf9244ca9ced.tar.gz |
zephyr: shim: update all pwms nodes to include frequency/period
Update all pwms entries to include a frequency/period specification, so
that it can be used by higher level drivers.
BRANCH=none
BUG=b:230093078
TEST=zmake testall
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: I6965f19a688a4cc85fbb0d2dac78c4bed34c8cef
Cq-Depend: chromium:3613422
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3602882
Reviewed-by: Wai-Hong Tam <waihong@google.com>
27 files changed, 45 insertions, 49 deletions
diff --git a/docs/zephyr/zephyr_pwm.md b/docs/zephyr/zephyr_pwm.md index 48221dd2a6..89be759d4a 100644 --- a/docs/zephyr/zephyr_pwm.md +++ b/docs/zephyr/zephyr_pwm.md @@ -28,8 +28,7 @@ For example for a keyboard backlight device: ``` kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; - frequency = <2400>; + pwms = <&pwm3 0 PWM_HZ(2400) PWM_POLARITY_NORMAL>; }; ``` @@ -110,8 +109,7 @@ channel per PWM on NPCX), normal polarity: / { kblight { compatible = "cros-ec,kblight-pwm"; - pwms = <&pwm3 0 0 PWM_POLARITY_NORMAL>; - frequency = <2400>; + pwms = <&pwm3 0 PWM_HZ(2400) PWM_POLARITY_NORMAL>; }; }; diff --git a/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts b/zephyr/boards/riscv/it8xxx2_evb/it8xxx2_evb.dts index 5b770bf71f..3ad4f2b1b3 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 PWM_CHANNEL_0 PWM_MSEC(20) PWM_POLARITY_NORMAL>; }; }; @@ -155,7 +155,7 @@ compatible = "cros-ec,fans"; fan_0 { - pwms = <&pwm7 PWM_CHANNEL_7 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm7 PWM_CHANNEL_7 PWM_KHZ(30) 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 2b7d24d320..f854f84d50 100644 --- a/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml +++ b/zephyr/dts/bindings/led/cros-ec,pwm-leds.yaml @@ -21,10 +21,9 @@ properties: pwmleds { compatible = "pwm-leds"; pwm_led0: pwm_led_0 { - pwms = <&pwm1 0 0 PWM_POLARITY_INVERTED - &pwm0 0 0 PWM_POLARITY_INVERTED - &pwm2 0 0 PWM_POLARITY_INVERTED>; - + pwms = <&pwm1 0 PWM_HZ(4800) PWM_POLARITY_INVERTED + &pwm0 0 PWM_HZ(4800) PWM_POLARITY_INVERTED + &pwm2 0 PWM_HZ(4800) PWM_POLARITY_INVERTED>; }; }; cros-pwmleds { @@ -42,8 +41,7 @@ properties: pwmleds { compatible = "pwm-leds"; pwm_sidesel: pwm_sidesel { - pwms = <&pwm7 0 0 PWM_POLARITY_INVERTED>; - + pwms = <&pwm7 0 PWM_HZ(4800) PWM_POLARITY_INVERTED>; }; }; cros-pwmleds { diff --git a/zephyr/projects/brya/fan.dts b/zephyr/projects/brya/fan.dts index d3032e83ec..46c00e057a 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 0 PWM_KHZ(1) 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 3030aee310..8cbcdb7a8c 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 PWM_HZ(2400) PWM_POLARITY_NORMAL>; frequency = <2400>; }; }; diff --git a/zephyr/projects/brya/pwm_leds.dts b/zephyr/projects/brya/pwm_leds.dts index ed05cfe786..3157d367f2 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 0 PWM_POLARITY_INVERTED - &pwm0 0 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 0 PWM_HZ(4800) PWM_POLARITY_INVERTED + &pwm0 0 PWM_HZ(4800) PWM_POLARITY_INVERTED>; }; pwm_led1: pwm_led_1 { - pwms = <&pwm1 0 0 PWM_POLARITY_INVERTED - &pwm7 0 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm1 0 PWM_HZ(4800) PWM_POLARITY_INVERTED + &pwm7 0 PWM_HZ(4800) PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/corsola/led_kingler.dts b/zephyr/projects/corsola/led_kingler.dts index 5ce5186305..19bb0978d8 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 0 PWM_POLARITY_INVERTED - &pwm1 0 0 PWM_POLARITY_INVERTED - &pwm2 0 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm0 0 PWM_HZ(100) PWM_POLARITY_INVERTED + &pwm1 0 PWM_HZ(100) PWM_POLARITY_INVERTED + &pwm2 0 PWM_HZ(100) PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/corsola/led_krabby.dts b/zephyr/projects/corsola/led_krabby.dts index c9bf539f7f..b6761e56e5 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 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm0 PWM_CHANNEL_0 PWM_HZ(324) PWM_POLARITY_INVERTED>; }; led_battery_amber: ec_led2_odl { - pwms = <&pwm1 PWM_CHANNEL_1 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm1 PWM_CHANNEL_1 PWM_HZ(324) PWM_POLARITY_INVERTED>; }; led_battery_white: ec_led3_odl { - pwms = <&pwm2 PWM_CHANNEL_2 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 PWM_CHANNEL_2 PWM_HZ(324) PWM_POLARITY_INVERTED>; }; }; }; diff --git a/zephyr/projects/herobrine/display.dts b/zephyr/projects/herobrine/display.dts index d683aa931f..6487e85255 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 0 PWM_HZ(4800) PWM_POLARITY_NORMAL>; frequency = <4800>; generic-pwm-channel = <1>; }; diff --git a/zephyr/projects/herobrine/keyboard.dts b/zephyr/projects/herobrine/keyboard.dts index 7237e56a1f..6ffb137ba1 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 PWM_KHZ(10) 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 233888c0ca..e679867970 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 PWM_KHZ(30) 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 84c8237a4c..dee444f441 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 PWM_KHZ(30) PWM_POLARITY_NORMAL>; pwm-frequency = <30000>; rpm_min = <3200>; rpm_start = <2200>; diff --git a/zephyr/projects/nissa/nereid_keyboard.dts b/zephyr/projects/nissa/nereid_keyboard.dts index 800681bdce..1283db24d9 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 PWM_KHZ(10) PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/nissa/nereid_pwm_leds.dts b/zephyr/projects/nissa/nereid_pwm_leds.dts index f096211cb5..178a21ea79 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 0 PWM_POLARITY_INVERTED>, - <&pwm2 2 0 PWM_POLARITY_INVERTED>, - <&pwm3 3 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm1 1 PWM_HZ(324) PWM_POLARITY_INVERTED>, + <&pwm2 2 PWM_HZ(324) PWM_POLARITY_INVERTED>, + <&pwm3 3 PWM_HZ(324) PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/nissa/nivviks_keyboard.dts b/zephyr/projects/nissa/nivviks_keyboard.dts index 7fc6fcd125..98c452a12d 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm6 6 PWM_KHZ(10) PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/nissa/nivviks_overlay.dts b/zephyr/projects/nissa/nivviks_overlay.dts index 48b395d7f0..1beb0376f4 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 5 PWM_KHZ(1) 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 5fb301bfa5..eb9b805a56 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 0 PWM_POLARITY_INVERTED>, - <&pwm0 0 0 PWM_POLARITY_INVERTED>, - <&pwm1 1 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 2 PWM_HZ(324) PWM_POLARITY_INVERTED>, + <&pwm0 0 PWM_HZ(324) PWM_POLARITY_INVERTED>, + <&pwm1 1 PWM_HZ(324) PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/npcx_evb/npcx7/fan.dts b/zephyr/projects/npcx_evb/npcx7/fan.dts index 90b6bcb257..d3c53c0bbe 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 PWM_KHZ(25) 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 f9e45d6e80..299e93a52a 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm2 0 PWM_KHZ(10) PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/npcx_evb/npcx9/fan.dts b/zephyr/projects/npcx_evb/npcx9/fan.dts index 90b6bcb257..d3c53c0bbe 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 PWM_KHZ(25) 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 f9e45d6e80..299e93a52a 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm2 0 PWM_KHZ(10) PWM_POLARITY_NORMAL>; frequency = <10000>; }; }; diff --git a/zephyr/projects/skyrim/fan.dts b/zephyr/projects/skyrim/fan.dts index 84fbfe675f..ba104044b2 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 PWM_KHZ(25) PWM_POLARITY_NORMAL>; pwm-frequency = <25000>; rpm_min = <3100>; rpm_start = <3100>; diff --git a/zephyr/projects/skyrim/keyboard.dts b/zephyr/projects/skyrim/keyboard.dts index b574a6d97e..bc20b259dc 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm1 0 PWM_HZ(100) PWM_POLARITY_NORMAL>; frequency = <100>; }; }; diff --git a/zephyr/projects/skyrim/pwm_leds.dts b/zephyr/projects/skyrim/pwm_leds.dts index 44bdc8bba6..7c70b7ce88 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 0 PWM_POLARITY_INVERTED - &pwm3 0 0 PWM_POLARITY_INVERTED>; + pwms = <&pwm2 0 PWM_HZ(100) PWM_POLARITY_INVERTED + &pwm3 0 PWM_HZ(100) PWM_POLARITY_INVERTED>; }; }; diff --git a/zephyr/projects/trogdor/lazor/display.dts b/zephyr/projects/trogdor/lazor/display.dts index d683aa931f..6487e85255 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm5 0 PWM_HZ(4800) 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 5a931c48b1..9a4fc0dd77 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm3 0 PWM_KHZ(10) 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 0450c907af..e4823bd104 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 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm0 0 PWM_HZ(324) PWM_POLARITY_NORMAL>; }; pwm_b: pwm_b { #led-pin-cells = <1>; - pwms = <&pwm2 0 0 PWM_POLARITY_NORMAL>; + pwms = <&pwm2 0 PWM_HZ(324) PWM_POLARITY_NORMAL>; }; }; |