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>

1 files changed, 161 insertions, 0 deletions

diff --git a/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml b/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml
new file mode 100644
index 0000000000..4c46fd4f64
--- /dev/null
+++ b/zephyr/dts/bindings/emul/zephyr,smart-battery.yaml
@@ -0,0 +1,161 @@
+# 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.
+
+description: Zephyr Smart Battery Emulator
+
+compatible: "zephyr,smart-battery"
+
+include: base.yaml
+
+properties:
+    mf-access:
+        type: int
+        required: false
+        default: 0
+        description: Word returned on manufacturer access command.
+
+    at-rate-full-mw-support:
+        type: boolean
+        description:
+          Flag indicating if AT_RATE_TIME_TO_FULL command supports mW capacity
+          mode.
+
+    version:
+        type: string
+        required: false
+        enum:
+          - BATTERY_SPEC_VER_1_0
+          - BATTERY_SPEC_VER_1_1
+          - BATTERY_SPEC_VER_1_1_WITH_PEC
+        default: BATTERY_SPEC_VER_1_1_WITH_PEC
+        description: Version of Smart Battery.
+
+    vscale:
+        type: int
+        required: false
+        default: 0
+        description: Scaling of voltage.
+
+    ipscale:
+        type: int
+        required: false
+        default: 0
+        description: Scaling of current.
+
+    int-charge-controller:
+        type: boolean
+        description: Flag indicating if internal charge controller is supported.
+
+    primary-battery:
+        type: boolean
+        description:
+          Flag indicating if primary battery role selection is supported.
+
+    design-mv:
+        type: int
+        required: false
+        default: 5000
+        description: Design battery voltage in mV.
+
+    design-cap:
+        type: int
+        required: false
+        default: 5000
+        description: Design battery capacity in mAh.
+
+    temperature:
+        type: int
+        required: false
+        default: 2930
+        description: Battery temperature in 0.1 Kelvins.
+
+    volt:
+        type: int
+        required: false
+        default: 5000
+        description: Battery voltage in mV.
+
+    cur:
+        type: int
+        required: false
+        default: 1000
+        description: Current charging (> 0) or discharging (< 0) battery in mA.
+
+    avg-cur:
+        type: int
+        required: false
+        default: 1000
+        description: Average current from 1 minute.
+
+    max-error:
+        type: int
+        required: false
+        default: 0
+        description: Maximum error of commands return value in percent.
+
+    cap:
+        type: int
+        required: false
+        default: 2000
+        description: Capacity of the battery in mAh.
+
+    full-cap:
+        type: int
+        required: false
+        default: 4000
+        description: Full capacity of the battery in mAh.
+
+    desired-charg-cur:
+        type: int
+        required: false
+        default: 2000
+        description: Charging current requested by battery.
+
+    desired-charg-volt:
+        type: int
+        required: false
+        default: 7000
+        description: Charging voltage requested by battery.
+
+    cycle-count:
+        type: int
+        required: false
+        default: 125
+        description: Number of cycles.
+
+    serial-number:
+        type: int
+        required: false
+        default: 7
+        description: Serial number of battery.
+
+    mf-name:
+        type: string
+        required: false
+        default: "zephyr"
+        description: Manufacturer name. Length has to be smaller than 32 bytes.
+
+    dev-name:
+        type: string
+        required: false
+        default: "smartbat"
+        description: Device name. Length has to be smaller than 32 bytes.
+
+    dev-chem:
+        type: string
+        required: false
+        default: "LION"
+        description: Device chemistry. Length has to be smaller than 32 bytes.
+
+    mf-data:
+        type: string
+        required: false
+        default: "LION"
+        description: Manufacturer data. Length has to be smaller than 32 bytes.
+
+    mf-info:
+       type: string
+       required: false
+       default: "LION"
+       description: Manufacturer info. Length has to be smaller than 32 bytes.