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/emul/emul_smart_battery.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/emul/emul_smart_battery.c')
-rw-r--r-- | zephyr/emul/emul_smart_battery.c | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/zephyr/emul/emul_smart_battery.c b/zephyr/emul/emul_smart_battery.c index 3f79ec2019..acada754d7 100644 --- a/zephyr/emul/emul_smart_battery.c +++ b/zephyr/emul/emul_smart_battery.c @@ -3,24 +3,23 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT zephyr_smart_battery - -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -#include <zephyr/logging/log.h> -LOG_MODULE_REGISTER(smart_battery); +#include "battery_smart.h" +#include "crc8.h" +#include "emul/emul_common_i2c.h" +#include "emul/emul_smart_battery.h" +#include "emul/emul_stub_device.h" #include <zephyr/device.h> #include <zephyr/drivers/emul.h> #include <zephyr/drivers/i2c.h> #include <zephyr/drivers/i2c_emul.h> +#include <zephyr/logging/log.h> #include <zephyr/ztest.h> -#include "emul/emul_common_i2c.h" -#include "emul/emul_smart_battery.h" +#define DT_DRV_COMPAT zephyr_smart_battery_emul -#include "crc8.h" -#include "battery_smart.h" -#include "emul/emul_stub_device.h" +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +LOG_MODULE_REGISTER(smart_battery); /** Run-time data used by the emulator */ struct sbat_emul_data { @@ -788,8 +787,10 @@ static int sbat_emul_access_reg(const struct emul *emul, int reg, int bytes, static int sbat_emul_init(const struct emul *emul, const struct device *parent) { struct sbat_emul_data *data = emul->data; + const struct i2c_common_emul_cfg *cfg = emul->cfg; data->common.i2c = parent; + data->common.cfg = cfg; i2c_common_emul_init(&data->common); @@ -901,14 +902,14 @@ static void emul_smart_battery_reset_capacity(const struct emul *emul) } #define SBAT_EMUL_RESET_RULE_AFTER(n) \ - emul_smart_battery_reset_capacity(EMUL_DT_GET(DT_DRV_INST(n))) + emul_smart_battery_reset_capacity(EMUL_DT_GET(DT_DRV_INST(n))); static void emul_sbat_reset(const struct ztest_unit_test *test, void *data) { ARG_UNUSED(test); ARG_UNUSED(data); - DT_INST_FOREACH_STATUS_OKAY(SBAT_EMUL_RESET_RULE_AFTER); + DT_INST_FOREACH_STATUS_OKAY(SBAT_EMUL_RESET_RULE_AFTER) } ZTEST_RULE(emul_smart_battery_reset, NULL, emul_sbat_reset); |