diff options
| author | YH Lin <yueherngl@google.com> | 2022-11-30 21:44:08 +0000 |
|---|---|---|
| committer | YH Lin <yueherngl@google.com> | 2022-11-30 21:44:08 +0000 |
| commit | af25602b15b22b9ef5821dcba9934311f2157c48 (patch) | |
| tree | d0c89ae8814c2ba35c238c6c0644ec6b1602c63a /zephyr/drivers/cros_displight/cros_displight.c | |
| parent | 54462f034b635260dd09173b3d082e47fc960ef3 (diff) | |
| parent | aa40b859b3a73e5a205bc561c1a29eff38485461 (diff) | |
| download | chrome-ec-af25602b15b22b9ef5821dcba9934311f2157c48.tar.gz | |
Merge remote-tracking branch cros/main into factory-brya-14517.B-main
Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt factory-brya-14517.B-main
Relevant changes:
git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/kano board/mithrax board/osiris board/primus
board/redrix board/taeko board/taniks board/vell board/volmar
driver/bc12/pi3usb9201_public.* driver/charger/bq25710.*
driver/ppc/nx20p348x.* driver/ppc/syv682x_public.*
driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.*
driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake*
include/intel_x86.h power/alderlake* power/intel_x86.c
util/getversion.sh
e6da633c38 driver: Sort header files
234a87ae2d tcpci: Add FRS enable to driver structure
a56be59ccd tcpm_header: add test for tcpm_dump_registers
57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT
e420c8ff9a marasov: Modify TypeC and TypeA configuration.
43b53e0045 Add default implementation of board_set_charge_limit
b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT
f1b563c350 baseboard: Sort header files
7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70
ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT
8f89f69a5b crota: disable lid angle sensor for clamshell
BRANCH=None
BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
BUG=b:163093572 b:254328661
TEST=`emerge-brya chromeos-ec`
Force-Relevant-Builds: all
Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47
Signed-off-by: YH Lin <yueherngl@google.com>
Diffstat (limited to 'zephyr/drivers/cros_displight/cros_displight.c')
| -rw-r--r-- | zephyr/drivers/cros_displight/cros_displight.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/zephyr/drivers/cros_displight/cros_displight.c b/zephyr/drivers/cros_displight/cros_displight.c index 98d1dd0823..850b0d7c90 100644 --- a/zephyr/drivers/cros_displight/cros_displight.c +++ b/zephyr/drivers/cros_displight/cros_displight.c @@ -5,29 +5,27 @@ #define DT_DRV_COMPAT cros_ec_displight +#include "common.h" +#include "util.h" + #include <zephyr/devicetree.h> -#include <drivers/cros_displight.h> #include <zephyr/drivers/pwm.h> #include <zephyr/logging/log.h> -#include "common.h" -#include "util.h" +#include <drivers/cros_displight.h> LOG_MODULE_REGISTER(displight, LOG_LEVEL_ERR); BUILD_ASSERT(DT_NUM_INST_STATUS_OKAY(DT_DRV_COMPAT) == 1, "Exactly one instance of cros-ec,displight should be defined."); -#define DISPLIGHT_PWM_NODE DT_INST_PWMS_CTLR(0) -#define DISPLIGHT_PWM_CHANNEL DT_INST_PWMS_CHANNEL(0) -#define DISPLIGHT_PWM_FLAGS DT_INST_PWMS_FLAGS(0) -#define DISPLIGHT_PWM_PERIOD_NS DT_INST_PWMS_PERIOD(0) +static const struct pwm_dt_spec displight_pwm = PWM_DT_SPEC_INST_GET(0); static int displight_percent; static void displight_set_duty(int percent) { - const struct device *pwm_dev = DEVICE_DT_GET(DISPLIGHT_PWM_NODE); + const struct device *pwm_dev = displight_pwm.dev; uint32_t pulse_ns; int rv; @@ -36,15 +34,14 @@ static void displight_set_duty(int percent) return; } - pulse_ns = DIV_ROUND_NEAREST(DISPLIGHT_PWM_PERIOD_NS * percent, 100); + pulse_ns = DIV_ROUND_NEAREST(displight_pwm.period * percent, 100); LOG_DBG("displight PWM %s set percent (%d), pulse %d", pwm_dev->name, percent, pulse_ns); - rv = pwm_set(pwm_dev, DISPLIGHT_PWM_CHANNEL, DISPLIGHT_PWM_PERIOD_NS, - pulse_ns, DISPLIGHT_PWM_FLAGS); + rv = pwm_set_pulse_dt(&displight_pwm, pulse_ns); if (rv) { - LOG_ERR("pwm_set() failed %s (%d)", pwm_dev->name, rv); + LOG_ERR("pwm_set_pulse_dt failed %s (%d)", pwm_dev->name, rv); } } |