diff options
| author | Madhurima Paruchuri <mparuchuri@google.com> | 2022-07-21 11:59:08 +0530 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-22 17:15:20 +0000 |
| commit | 77df397abfdedb063f9e72ec2c12b7993856c2ac (patch) | |
| tree | 0f8cb8805e3255a9a3cb9a93c815802fa4c17b4c | |
| parent | 1041d49b493d4036ae1a554ea5bc68bc151372fd (diff) | |
| download | chrome-ec-77df397abfdedb063f9e72ec2c12b7993856c2ac.tar.gz | |
zephyr: shim: leds: Use 'period' from PWM spec inplace of 'pwm-frequency'
Update driver to use 'period' from PWM spec inplace of 'pwm-frequency'
BUG=b:230093078
BRANCH=none
TEST=zmake testall
Signed-off-by: Madhurima Paruchuri <mparuchuri@google.com>
Change-Id: I609619010d15a74bc3952d10788f5ef77ad877e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3777837
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
| -rw-r--r-- | zephyr/shim/src/led_driver/led.h | 4 | ||||
| -rw-r--r-- | zephyr/shim/src/led_driver/led_pwm.c | 17 |
2 files changed, 6 insertions, 15 deletions
diff --git a/zephyr/shim/src/led_driver/led.h b/zephyr/shim/src/led_driver/led.h index ddde50a347..155763ecca 100644 --- a/zephyr/shim/src/led_driver/led.h +++ b/zephyr/shim/src/led_driver/led.h @@ -61,9 +61,7 @@ struct gpio_pin_t { * Struct defining LED PWM pin and duty cycle to set. */ struct pwm_pin_t { - const struct device *pwm; - uint8_t channel; - pwm_flags_t flags; + struct pwm_dt_spec pwm; uint32_t pulse_ns; /* PWM Duty cycle ns */ }; diff --git a/zephyr/shim/src/led_driver/led_pwm.c b/zephyr/shim/src/led_driver/led_pwm.c index 37bd03d69a..60b7085e38 100644 --- a/zephyr/shim/src/led_driver/led_pwm.c +++ b/zephyr/shim/src/led_driver/led_pwm.c @@ -27,18 +27,13 @@ LOG_MODULE_REGISTER(pwm_led, LOG_LEVEL_ERR); * e.g. freq = 500 Hz, period_ns = 1000000000/500 = 2000000ns * duty_cycle = 50 %, pulse_ns = (2000000*50)/100 = 1000000ns */ -const uint32_t period_ns = - (NSEC_PER_SEC / DT_PROP(PWM_LED_PINS_NODE, pwm_frequency)); #define SET_PIN(node_id, prop, i) \ { \ - .pwm = DEVICE_DT_GET( \ - DT_PWMS_CTLR(DT_PHANDLE_BY_IDX(node_id, prop, i))), \ - .channel = \ - DT_PWMS_CHANNEL(DT_PHANDLE_BY_IDX(node_id, prop, i)), \ - .flags = DT_PWMS_FLAGS(DT_PHANDLE_BY_IDX(node_id, prop, i)), \ + .pwm = PWM_DT_SPEC_GET(DT_PHANDLE_BY_IDX(node_id, prop, i)), \ .pulse_ns = DIV_ROUND_NEAREST( \ - period_ns * DT_PHA_BY_IDX(node_id, prop, i, value), \ + DT_PWMS_PERIOD(DT_PHANDLE_BY_IDX(node_id, prop, i)) * \ + DT_PHA_BY_IDX(node_id, prop, i, value), \ 100), \ }, @@ -78,11 +73,9 @@ const struct led_pins_node_t *pins_node[] = { DT_FOREACH_CHILD( */ void led_set_color_with_node(const struct led_pins_node_t *pins_node) { + struct pwm_pin_t *pwm_pins = pins_node->pwm_pins; for (int j = 0; j < pins_node->pins_count; j++) { - pwm_set(pins_node->pwm_pins[j].pwm, - pins_node->pwm_pins[j].channel, period_ns, - pins_node->pwm_pins[j].pulse_ns, - pins_node->pwm_pins[j].flags); + pwm_set_pulse_dt(&pwm_pins[j].pwm, pwm_pins[j].pulse_ns); } } |