Merge remote-tracking branch cros/main into firmware-keeby-14119.B-mainfirmware-keeby-14119.B-main

Relevant changes:

git log --oneline c5bd23a4b..b44d10f8f -- baseboard/dedede board/cappy2
board/corori board/driblee board/gooey board/haboki board/lalala
board/waddledoo2 common/charge_state_v2.c common/mkbp_* common/ocpc.c
common/usbc/usb_tc_drp_acc_trysrc_sm.c common/usbc/usb_sm.c
common/usbc/*_pd_* common/usbc/dp_alt_mode.c common/usbc/usb_prl_sm.c
common/usbc/usb_pe_drp_sm.c common/usb_charger.c common/usb_common.c
common/usbc_ocp.c driver/charger/sm5803.* driver/charger/isl923x.*
driver/tcpm/raa489000.* driver/tcpm/it83* include/power/icelake.h
include/intel_x86.h power/icelake.c power/intel_x86.c util/getversion.sh

42d03a001 config: change temp_sensor_power from config to gpio
e296efb28 usb_common: Fix CONFIG_USB_PD_DISCHARGE_TCPC typo
c346481f4 atomic: cast to unsigned when shifting
9b972a0f2 driver/tcpm/it83xx, it8xxx2: ITE inactive port return from HOOK
a499d8fd4 driver/tcpm/it83xx, it8xxx2: set sleep mask for mixed TCPC case
ed62e2583 TCPMv2: don't set the sleep mask for TCPC embedded in EC
c962696e8 motion_sensor: Remove |int_signal| field
86b216794 ocpc: modify pre-charge target condition
6f8336eb4 dedede: Set MKBP event wake mask to 0
02d034df0 dedede: add stylus fw_config
4f7cd7509 atomic: use atomic_t where it is possible
e3ffa0519 mkbp: change the type fifo_entries to atomic_t
bb4c47af0 usb: use atomic_t where possible
c6e513ee2 power/icelake: Add SLP_S5 as a watched power signal
d89e49b20 power: Introduce S4 as a real power state
ba8a3c9c0 chgstv2: Use chipset_in_state instead of naming states
23a975d12 i2c: Use declared initializers for i2c_ports: boards a-l
35865dbec TCPMv2: Guard DATA_RESET using CONFIG_USB_PD_DATA_RESET_MSG
d4d8243ed i2c: Use declared initializers for i2c_ports: baseboards
eba8d0305 RAA489000: Fixed RAA489000 max charging current
e78b83e0f TCPMv2: Delay Data Reset until mode entry request
6230e60fc TCPMv2: Support Data Reset as DFP, initiator
412246836 intel_x86: Apply chipset resume init and suspend complete hooks
f2809b72c config: rename CONFIG_HOSTCMD_ESPI to CONFIG_HOST_INTERFACE_ESPI

BRANCH=None
BUG=b:202796060 b:207805856 b:167983049 b:208318528 b:181983966
BUG=b:207328258 b:195416058 b:205285137 b:199919093 b:207055975
BUG=b:129159505 b:204947672 b:141363146 b:207082842 b:205675485
TEST=`make -j buildall`

Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Change-Id: I980351977e11088a130e478df0701be4715f049b

1 files changed, 52 insertions, 0 deletions

diff --git a/zephyr/dts/bindings/cbi/named-cbi-fw-config.yaml b/zephyr/dts/bindings/cbi/named-cbi-fw-config.yaml
new file mode 100644
index 0000000000..c8871ddb00
--- /dev/null
+++ b/zephyr/dts/bindings/cbi/named-cbi-fw-config.yaml
@@ -0,0 +1,52 @@
+# Copyright 2021 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+description: CBI Firmware Config fields (FW_CONFIG)
+
+compatible: "named-cbi-fw-config"
+
+child-binding:
+    description:
+        CBI Firmware Config fields definition.
+        Each field is defined via a start bit (from LSB) and a size.
+        The total size of all FW_CONFIG bit fields must not exceed 32 bits.
+    properties:
+        enum-name:
+            type: string
+            required: true
+            description:
+              Name of field used for description purposes
+        start:
+            type: int
+            required: true
+            description: The starting bit of the field (LSB = 0)
+        size:
+            type: int
+            required: true
+            description: The size of the field in bits.
+
+# Example:
+#
+# cbi-fw-config {
+#     compatible = "named-cbi-fw-config";
+#
+#     fan {
+#         enum-name = "FAN";
+#         start = <0>
+#         size = <1>;
+#         fan_absent {
+#             enum-name = "ABSENT"
+#             compatible = "named-cbi-fw-config-value";
+#             value = <0>;
+#         fan_present {
+#             enum-name = "PRESENT"
+#             compatible = "named-cbi-fw-config-value";
+#             value = <1>;
+#         };
+#     };
+# };
+#
+# This will generate an enum field id for CBI_FW_CONFIG_FIELD_FAN,
+# and separate values for CBI_FW_CONFIG_FIELD_FAN_ABSENT = 0 and
+# CBI_FW_CONFIG_FIELD_FAN_PRESENT = 1