diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:08:36 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:59:38 -0700 |
commit | c453fd704268ef72de871b0c5ac7a989de662334 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /zephyr/shim/src/pwm_led.c | |
parent | 6c1587ca70f558b4f96b3f0b18ad8b027d3ba99d (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-firmware-fpmcu-dartmonkey-release.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-dartmonkey-releasefirmware-fpmcu-dartmonkey-release
Generated by: ./util/update_release_branch.py --board dartmonkey --relevant_paths_file
./util/fingerprint-relevant-paths.txt firmware-fpmcu-dartmonkey-release
Relevant changes:
git log --oneline 6c1587ca70..28712dae9d -- board/nocturne_fp
board/dartmonkey common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
a0751778f4 board/nocturne_fp/ro_workarounds.c: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
58f0246dbe board/nocturne_fp/board_ro.c: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
84e53a65da board/nocturne_fp/board.h: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:244387210 b:242720240 b:215613183 b:242720910 b:236386294
BUG=b:234181908 b:244781166 b:234781655 b:234143158 b:234181908
BUG=b:237344361 b:236025198 b:234181908 b:180945056 chromium:1098010
BUG=b:246424843 b:234181908 b:131913998
TEST=`make -j buildall`
TEST=./util/run_device_tests.py --board dartmonkey
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "panic_data_dartmonkey_v2.0.2887": PASSED
Test "panic_data_nocturne_fp_v2.2.64": PASSED
Test "panic_data_nami_fp_v2.2.144": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I2c312583a709fedae8fe11d92c22328c3b634bc7
Diffstat (limited to 'zephyr/shim/src/pwm_led.c')
-rw-r--r-- | zephyr/shim/src/pwm_led.c | 152 |
1 files changed, 78 insertions, 74 deletions
diff --git a/zephyr/shim/src/pwm_led.c b/zephyr/shim/src/pwm_led.c index 09fbd009b4..498c543ffb 100644 --- a/zephyr/shim/src/pwm_led.c +++ b/zephyr/shim/src/pwm_led.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -22,111 +22,112 @@ LOG_MODULE_REGISTER(pwm_led, LOG_LEVEL_ERR); BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) <= 1, "Multiple CrOS EC PWM LED instances defined"); -BUILD_ASSERT(DT_INST_PROP_LEN(0, leds) <= 2, + +#define PWM_LEDS_LEN DT_INST_PROP_LEN(0, leds) +BUILD_ASSERT((PWM_LEDS_LEN > 0) && (PWM_LEDS_LEN <= 2), "Unsupported number of LEDs defined"); -#define PWM_LED_PERIOD_NS (NSEC_PER_SEC/DT_INST_PROP(0, frequency)) -#define PWM_SIDESEL_PERIOD_NS (PWM_LED_PERIOD_NS * 2) +#define PWM_LED_0_0_PERIOD \ + DT_PWMS_PERIOD_BY_IDX(DT_INST_PHANDLE_BY_IDX(0, leds, 0), 0) +#define PWM_LED_PERIOD_BUILD_ASSERT(node_id, prop, idx, ...) \ + BUILD_ASSERT(PWM_LED_0_0_PERIOD == \ + DT_PWMS_PERIOD_BY_IDX(node_id, idx), \ + "PWM LED period mismatch"); +#define PWM_LEDS_BUILD_ASSERT(node_id, prop, idx) \ + DT_FOREACH_PROP_ELEM_VARGS(DT_PHANDLE_BY_IDX(node_id, prop, idx), \ + pwms, PWM_LED_PERIOD_BUILD_ASSERT) + +DT_INST_FOREACH_PROP_ELEM(0, leds, PWM_LEDS_BUILD_ASSERT) #define PWM_LED_NAME(node_id) DT_STRING_UPPER_TOKEN(node_id, ec_led_name) -#define PWM_LED_NAME_WITH_COMMA(node_id) PWM_LED_NAME(node_id), -const enum ec_led_id supported_led_ids[] = { - DT_INST_FOREACH_CHILD(0, PWM_LED_NAME_WITH_COMMA) -}; +const enum ec_led_id supported_led_ids[] = { DT_INST_FOREACH_CHILD_SEP( + 0, PWM_LED_NAME, (, )) }; const int supported_led_ids_count = ARRAY_SIZE(supported_led_ids); BUILD_ASSERT(ARRAY_SIZE(supported_led_ids) == DT_INST_PROP_LEN(0, leds), "Mismatch count of LED device phandles and LED name map entries."); -static void pwm_led_set_duty(const struct pwm_led_dt_channel *ch, int percent) +static void pwm_led_set_duty(const struct pwm_dt_spec *pwm, int percent) { uint32_t pulse_ns; int rv; - if (!device_is_ready(ch->dev)) { - LOG_ERR("PWM device %s not ready", ch->dev->name); + if (!device_is_ready(pwm->dev)) { + LOG_ERR("PWM device %s not ready", pwm->dev->name); return; } - pulse_ns = DIV_ROUND_NEAREST(ch->period_ns * percent, 100); + pulse_ns = DIV_ROUND_NEAREST(pwm->period * percent, 100); - LOG_DBG("LED PWM %s set percent (%d), pulse %d", ch->dev->name, percent, - pulse_ns); + LOG_DBG("LED PWM %s set percent (%d), pulse %d", pwm->dev->name, + percent, pulse_ns); - rv = pwm_set(ch->dev, ch->channel, ch->period_ns, pulse_ns, ch->flags); + rv = pwm_set_pulse_dt(pwm, pulse_ns); if (rv) { - LOG_ERR("pwm_set() failed %s (%d)", ch->dev->name, rv); + LOG_ERR("pwm_set_pulse_dt() failed %s (%d)", pwm->dev->name, + rv); } } -#define PWM_CHANNEL_DT_BY_IDX_INIT(node_id, led_ch, _period_ns) \ - { \ - .dev = DEVICE_DT_GET(DT_PWMS_CTLR_BY_IDX(node_id, led_ch)), \ - .channel = DT_PWMS_CHANNEL_BY_IDX(node_id, led_ch), \ - .flags = DT_PWMS_FLAGS_BY_IDX(node_id, led_ch), \ - .period_ns = _period_ns, \ - } - -#define PWM_CHANNEL_DT_BY_IDX(node_id, prop, idx, led_ch) \ - static const struct pwm_led_dt_channel _pwm_led_dt_##idx##_ch_##led_ch = \ - PWM_CHANNEL_DT_BY_IDX_INIT( \ - DT_PHANDLE_BY_IDX(node_id, prop, idx), led_ch, \ - PWM_LED_PERIOD_NS); +#define PWM_CHANNEL_DT_BY_IDX(node_id, prop, idx, led_ch) \ + static const struct pwm_dt_spec _pwm_dt_spec_##idx##_ch_##led_ch = \ + PWM_DT_SPEC_GET_BY_IDX(DT_PHANDLE_BY_IDX(node_id, prop, idx), \ + led_ch); -#define PWM_CHANNEL_DT_BY_IDX_COND(node_id, prop, idx, led_ch) \ - IF_ENABLED(DT_PROP_HAS_IDX( \ - DT_PHANDLE_BY_IDX(node_id, prop, idx), pwms, led_ch), \ - (PWM_CHANNEL_DT_BY_IDX(node_id, prop, idx, led_ch)) \ - ) +#define PWM_CHANNEL_DT_BY_IDX_COND(node_id, prop, idx, led_ch) \ + IF_ENABLED(DT_PROP_HAS_IDX(DT_PHANDLE_BY_IDX(node_id, prop, idx), \ + pwms, led_ch), \ + (PWM_CHANNEL_DT_BY_IDX(node_id, prop, idx, led_ch))) -#define PWM_LED_DT_INIT(node_id, prop, idx) \ +#define PWM_LED_DT_INIT(node_id, prop, idx) \ PWM_CHANNEL_DT_BY_IDX_COND(node_id, prop, idx, 0) \ PWM_CHANNEL_DT_BY_IDX_COND(node_id, prop, idx, 1) \ PWM_CHANNEL_DT_BY_IDX_COND(node_id, prop, idx, 2) DT_INST_FOREACH_PROP_ELEM(0, leds, PWM_LED_DT_INIT) -#define PWM_CHANNEL_BY_IDX_COND(node_id, prop, idx, led_ch) \ - COND_CODE_1(DT_PROP_HAS_IDX( \ - DT_PHANDLE_BY_IDX(node_id, prop, idx), pwms, led_ch), \ - (&_pwm_led_dt_##idx##_ch_##led_ch), \ - (PWM_LED_NO_CHANNEL)) +#define PWM_CHANNEL_BY_IDX_COND(node_id, prop, idx, led_ch) \ + COND_CODE_1(DT_PROP_HAS_IDX(DT_PHANDLE_BY_IDX(node_id, prop, idx), \ + pwms, led_ch), \ + (&_pwm_dt_spec_##idx##_ch_##led_ch), (PWM_LED_NO_CHANNEL)) -#define PWM_LED_INIT(node_id, prop, idx) \ - [PWM_LED##idx] = { \ +#define PWM_LED_INIT(node_id, prop, idx) \ + [PWM_LED##idx] = { \ .ch0 = PWM_CHANNEL_BY_IDX_COND(node_id, prop, idx, 0), \ .ch1 = PWM_CHANNEL_BY_IDX_COND(node_id, prop, idx, 1), \ .ch2 = PWM_CHANNEL_BY_IDX_COND(node_id, prop, idx, 2), \ - .set_duty = &pwm_led_set_duty, \ + .set_duty = &pwm_led_set_duty, \ }, -struct pwm_led pwm_leds[] = { - DT_INST_FOREACH_PROP_ELEM(0, leds, PWM_LED_INIT) -}; +struct pwm_led pwm_leds[] = { DT_INST_FOREACH_PROP_ELEM(0, leds, + PWM_LED_INIT) }; -#define EC_LED_COLOR_BLANK {0} +#define EC_LED_COLOR_BLANK \ + { \ + 0 \ + } struct pwm_led_color_map led_color_map[EC_LED_COLOR_COUNT] = { - [EC_LED_COLOR_RED] = DT_INST_PROP_OR(0, color_map_red, - EC_LED_COLOR_BLANK), - [EC_LED_COLOR_GREEN] = DT_INST_PROP_OR(0, color_map_green, - EC_LED_COLOR_BLANK), - [EC_LED_COLOR_BLUE] = DT_INST_PROP_OR(0, color_map_blue, - EC_LED_COLOR_BLANK), - [EC_LED_COLOR_YELLOW] = DT_INST_PROP_OR(0, color_map_yellow, - EC_LED_COLOR_BLANK), - [EC_LED_COLOR_WHITE] = DT_INST_PROP_OR(0, color_map_white, - EC_LED_COLOR_BLANK), - [EC_LED_COLOR_AMBER] = DT_INST_PROP_OR(0, color_map_amber, - EC_LED_COLOR_BLANK), + [EC_LED_COLOR_RED] = + DT_INST_PROP_OR(0, color_map_red, EC_LED_COLOR_BLANK), + [EC_LED_COLOR_GREEN] = + DT_INST_PROP_OR(0, color_map_green, EC_LED_COLOR_BLANK), + [EC_LED_COLOR_BLUE] = + DT_INST_PROP_OR(0, color_map_blue, EC_LED_COLOR_BLANK), + [EC_LED_COLOR_YELLOW] = + DT_INST_PROP_OR(0, color_map_yellow, EC_LED_COLOR_BLANK), + [EC_LED_COLOR_WHITE] = + DT_INST_PROP_OR(0, color_map_white, EC_LED_COLOR_BLANK), + [EC_LED_COLOR_AMBER] = + DT_INST_PROP_OR(0, color_map_amber, EC_LED_COLOR_BLANK), }; BUILD_ASSERT(DT_INST_PROP_LEN(0, brightness_range) == EC_LED_COLOR_COUNT, "brightness_range must have exactly EC_LED_COLOR_COUNT values"); -static const uint8_t dt_brigthness_range[EC_LED_COLOR_COUNT] = DT_INST_PROP( - 0, brightness_range); +static const uint8_t dt_brigthness_range[EC_LED_COLOR_COUNT] = + DT_INST_PROP(0, brightness_range); void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) { @@ -135,8 +136,8 @@ void led_get_brightness_range(enum ec_led_id led_id, uint8_t *brightness_range) sizeof(dt_brigthness_range)); } -#define PWM_NAME_TO_ID(node_id) \ - case PWM_LED_NAME(node_id): \ +#define PWM_NAME_TO_ID(node_id) \ + case PWM_LED_NAME(node_id): \ pwm_id = DT_REG_ADDR(node_id); \ break; @@ -145,7 +146,7 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) enum pwm_led_id pwm_id; switch (led_id) { - DT_INST_FOREACH_CHILD(0, PWM_NAME_TO_ID) + DT_INST_FOREACH_CHILD(0, PWM_NAME_TO_ID) default: return EC_ERROR_UNKNOWN; } @@ -154,19 +155,19 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) brightness[EC_LED_COLOR_RED]) { set_pwm_led_color(pwm_id, EC_LED_COLOR_RED); } else if (DT_INST_NODE_HAS_PROP(0, color_map_green) && - brightness[EC_LED_COLOR_GREEN]) { + brightness[EC_LED_COLOR_GREEN]) { set_pwm_led_color(pwm_id, EC_LED_COLOR_GREEN); } else if (DT_INST_NODE_HAS_PROP(0, color_map_blue) && - brightness[EC_LED_COLOR_BLUE]) { + brightness[EC_LED_COLOR_BLUE]) { set_pwm_led_color(pwm_id, EC_LED_COLOR_BLUE); } else if (DT_INST_NODE_HAS_PROP(0, color_map_yellow) && - brightness[EC_LED_COLOR_YELLOW]) { + brightness[EC_LED_COLOR_YELLOW]) { set_pwm_led_color(pwm_id, EC_LED_COLOR_YELLOW); } else if (DT_INST_NODE_HAS_PROP(0, color_map_white) && - brightness[EC_LED_COLOR_WHITE]) { + brightness[EC_LED_COLOR_WHITE]) { set_pwm_led_color(pwm_id, EC_LED_COLOR_WHITE); } else if (DT_INST_NODE_HAS_PROP(0, color_map_amber) && - brightness[EC_LED_COLOR_AMBER]) { + brightness[EC_LED_COLOR_AMBER]) { set_pwm_led_color(pwm_id, EC_LED_COLOR_AMBER); } else { /* Otherwise, the "color" is "off". */ @@ -178,9 +179,12 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness) #if DT_INST_NODE_HAS_PROP(0, sidesel) -static const struct pwm_led_dt_channel _pwm_led_dt_sidesel = - PWM_CHANNEL_DT_BY_IDX_INIT(DT_INST_PROP(0, sidesel), 0, - PWM_SIDESEL_PERIOD_NS); +BUILD_ASSERT((PWM_LED_0_0_PERIOD * 2) == + DT_PWMS_PERIOD(DT_INST_PROP(0, sidesel)), + "Sidesel PWM period not properly set"); + +static const struct pwm_dt_spec _pwm_dt_spec_sidesel = + PWM_DT_SPEC_GET_BY_IDX(DT_INST_PROP(0, sidesel), 0); /* Illuminates the LED on the side of the active charging port. If not charging, * illuminates both LEDs. @@ -203,14 +207,14 @@ static void led_set_charge_port_tick(void) } if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED)) - pwm_led_set_duty(&_pwm_led_dt_sidesel, side_select_duty); + pwm_led_set_duty(&_pwm_dt_spec_sidesel, side_select_duty); } DECLARE_HOOK(HOOK_TICK, led_set_charge_port_tick, HOOK_PRIO_DEFAULT); static void board_led_init(void) { /* Illuminate motherboard and daughter board LEDs equally to start. */ - pwm_led_set_duty(&_pwm_led_dt_sidesel, 50); + pwm_led_set_duty(&_pwm_dt_spec_sidesel, 50); } DECLARE_HOOK(HOOK_INIT, board_led_init, HOOK_PRIO_DEFAULT); |