From dd732876495ed4942d00b9f9ca8dd3b01bad7120 Mon Sep 17 00:00:00 2001 From: YH Lin Date: Sat, 3 Dec 2022 00:17:55 +0000 Subject: Revert "Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main" This reverts commit 184d13e77614be3be5374d3fef9d1edf66ec8687. Reason for revert: broken build due to ec-utils. Original change's description: > Merge remote-tracking branch cros/main into factory-brya-14909.124.B-main > > Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file > baseboard/brya/relevant-paths.txt factory-brya-14909.124.B-main > > Relevant changes: > > git log --oneline 19d4d68ffa..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:260630630 b:163093572 b:259002141 b:255184961 b:259354679 > BUG=b:247100970 b:254328661 > TEST=`emerge-brya chromeos-ec` > > Force-Relevant-Builds: all > Change-Id: I0ecfa0e6af68631283c7a9e8f1afb9d827176c62 > Signed-off-by: YH Lin Bug: b:260630630 b:163093572 b:259002141 b:255184961 b:259354679 Bug: b:247100970 b:254328661 Change-Id: Ia14942d1bd6a502062399d77cb59d1f4b549b2c9 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077247 Auto-Submit: YH Lin Tested-by: YH Lin Reviewed-by: Boris Mittelberg Commit-Queue: YH Lin --- docs/zephyr/zephyr_ssfc.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'docs/zephyr/zephyr_ssfc.md') diff --git a/docs/zephyr/zephyr_ssfc.md b/docs/zephyr/zephyr_ssfc.md index 6a3fe079d3..d40fdbc9c4 100644 --- a/docs/zephyr/zephyr_ssfc.md +++ b/docs/zephyr/zephyr_ssfc.md @@ -25,11 +25,11 @@ Device tree is used to define and specify the field sizes and values. ## Devicetree Nodes -The [`SSFC`] device tree nodes are defined via the [`cros-ec,cbi-ssfc`] and -[`cros-ec,cbi-ssfc-value`] YAML bindings. +The [`SSFC`] device tree nodes are defined via the [`named-cbi-ssfc`] and +[`named-cbi-ssfc-value`] YAML bindings. -The [`cros-ec,cbi-ssfc`] bindings define the name and size of each field. -The [`cros-ec,cbi-ssfc-value`] bindings allow names/values to be defined for each +The [`named-cbi-ssfc`] bindings define the name and size of each field. +The [`named-cbi-ssfc-value`] bindings allow names/values to be defined for each value that may be stored in the field. One of the values may be designated as the default, which is used if the [`CBI`] data cannot be accessed. @@ -41,12 +41,12 @@ value is used as a default, indicating the default field. An example definition is: ``` cbi-ssfc { - compatible = "cros-ec,cbi-ssfc"; + compatible = "named-cbi-ssfc"; base_sensor { enum-name = "BASE_SENSOR"; size = <3>; base_sensor_0: bmi160 { - compatible = "cros-ec,cbi-ssfc-value"; + compatible = "named-cbi-ssfc-value"; status = "okay"; value = <1>; }; @@ -55,7 +55,7 @@ cbi-ssfc { enum-name = "LID_SENSOR"; size = <3>; lid_sensor_0: bma255 { - compatible = "cros-ec,cbi-ssfc-value"; + compatible = "named-cbi-ssfc-value"; status = "okay"; value = <1>; }; @@ -64,7 +64,7 @@ cbi-ssfc { enum-name = "LIGHTBAR"; size = <2>; lightbar_0: 10_led { - compatible = "cros-ec,cbi-ssfc-value"; + compatible = "named-cbi-ssfc-value"; status = "okay"; value = <1>; }; @@ -99,6 +99,6 @@ The [`ectool cbi`] command can be used to read and set the [`SSFC`]. [`CBI`]: https://chromium.googlesource.com/chromiumos/docs/+/HEAD/design_docs/cros_board_info.md [`CBI Configuration`]: ./zephyr_cbi.md [`ectool cbi`]: ./zephyr_cbi.md#testing-and-debugging -[`cros-ec,cbi-ssfc`]: ../../zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config.yaml -[`cros-ec,cbi-ssfc-value`]: ../../zephyr/dts/bindings/cbi/cros-ec,cbi-fw-config-value.yaml +[`named-cbi-ssfc`]: ../../zephyr/dts/bindings/cbi/named-cbi-fw-config.yaml +[`named-cbi-ssfc-value`]: ../../zephyr/dts/bindings/cbi/named-cbi-fw-config-value.yaml [`SSFC`]: https://chromium.googlesource.com/chromiumos/docs/+/HEAD/design_docs/firmware_config.md -- cgit v1.2.1