diff options
| author | YH Lin <yueherngl@chromium.org> | 2022-12-03 00:19:30 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-05 17:43:05 +0000 |
| commit | c8af732351cc5c7167f27e8390e26f0556f53a5a (patch) | |
| tree | bdff671e5ad3e71e30ab56f4f084f34a2fd72e28 /zephyr/emul/emul_bb_retimer.c | |
| parent | af25602b15b22b9ef5821dcba9934311f2157c48 (diff) | |
| download | chrome-ec-factory-brya-14517.B-main.tar.gz | |
Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main"factory-brya-14517.B-main
This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48.
Reason for revert: broken build due to ec-utils.
Original change's description:
> 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>
Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630
Bug: b:163093572 b:254328661
Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248
Tested-by: YH Lin <yueherngl@chromium.org>
Commit-Queue: YH Lin <yueherngl@chromium.org>
Reviewed-by: Boris Mittelberg <bmbm@google.com>
Auto-Submit: YH Lin <yueherngl@chromium.org>
Diffstat (limited to 'zephyr/emul/emul_bb_retimer.c')
| -rw-r--r-- | zephyr/emul/emul_bb_retimer.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/zephyr/emul/emul_bb_retimer.c b/zephyr/emul/emul_bb_retimer.c index 8028c53c0f..266fd1a340 100644 --- a/zephyr/emul/emul_bb_retimer.c +++ b/zephyr/emul/emul_bb_retimer.c @@ -3,21 +3,22 @@ * found in the LICENSE file. */ -#include "driver/retimer/bb_retimer.h" -#include "emul/emul_bb_retimer.h" -#include "emul/emul_common_i2c.h" -#include "emul/emul_stub_device.h" +#define DT_DRV_COMPAT cros_bb_retimer_emul + +#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL +#include <zephyr/logging/log.h> +LOG_MODULE_REGISTER(emul_bb_retimer); #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> -#define DT_DRV_COMPAT intel_jhl8040r +#include "emul/emul_common_i2c.h" +#include "emul/emul_bb_retimer.h" +#include "emul/emul_stub_device.h" -#define LOG_LEVEL CONFIG_I2C_LOG_LEVEL -LOG_MODULE_REGISTER(emul_bb_retimer); +#include "driver/retimer/bb_retimer.h" /** Run-time data used by the emulator */ struct bb_emul_data { @@ -308,9 +309,10 @@ static int bb_emul_init(const struct emul *emul, const struct device *parent) #define BB_RETIMER_EMUL(n) \ static struct bb_emul_data bb_emul_data_##n = { \ - .vendor_id = BB_RETIMER_VENDOR_ID_1, \ - .error_on_ro_write = true, \ - .error_on_rsvd_write = true, \ + .vendor_id = DT_STRING_TOKEN(DT_DRV_INST(n), vendor), \ + .error_on_ro_write = DT_INST_PROP(n, error_on_ro_write),\ + .error_on_rsvd_write = DT_INST_PROP(n, \ + error_on_reserved_bit_write), \ .common = { \ .start_write = NULL, \ .write_byte = bb_emul_write_byte, \ |