From 42d83017fb78371f1ded1af599089daedf3a9a4d Mon Sep 17 00:00:00 2001 From: Tristan Honscheid Date: Mon, 13 Feb 2023 18:55:10 -0700 Subject: zephyr: Fix YAML files to conform with upstream style cl:4177231 enabled YAML file linting for platform/ec/zephyr files based on upstream Zephyr's style but several of our YAML files do not currently conform. This CL has all the required corrections when running the linter on every YAML file. BUG=None TEST=util/zephyr_check_compliance.py modified to scan everything BRANCH=None Change-Id: I9dcf1d7f0c306028e4d6b368f20e88c882514169 Signed-off-by: Tristan Honscheid Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4247159 Reviewed-by: Fabio Baltieri Commit-Queue: Fabio Baltieri --- zephyr/dts/bindings/battery/bms-gf,cr50.yaml | 90 +++++++++++----------- .../dts/bindings/power/ap-pwrseq-sub-states.yaml | 6 +- zephyr/test/drivers/testcase.yaml | 7 +- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/zephyr/dts/bindings/battery/bms-gf,cr50.yaml b/zephyr/dts/bindings/battery/bms-gf,cr50.yaml index 8175e48eb1..cd5cc8c05a 100644 --- a/zephyr/dts/bindings/battery/bms-gf,cr50.yaml +++ b/zephyr/dts/bindings/battery/bms-gf,cr50.yaml @@ -4,50 +4,50 @@ compatible: "bms-gf,cr50" include: battery-smart.yaml properties: - enum-name: - type: string - default: "bms-gf,cr50" + enum-name: + type: string + default: "bms-gf,cr50" - # Fuel gauge - manuf_name: - default: "BMS-GF" - device_name: - default: "CR50" - ship_mode_reg_addr: - default: 0x00 - ship_mode_reg_data: - default: [ 0x0010, 0x0010 ] - fet_mfgacc_support: - default: 0 - fet_reg_addr: - default: 0x43 - fet_reg_mask: - default: 0x0001 - fet_disconnect_val: - default: 0x0000 - fet_cfet_mask: - default: 0x0002 - fet_cfet_off_val: - default: 0x0000 + # Fuel gauge + manuf_name: + default: "BMS-GF" + device_name: + default: "CR50" + ship_mode_reg_addr: + default: 0x00 + ship_mode_reg_data: + default: [0x0010, 0x0010] + fet_mfgacc_support: + default: 0 + fet_reg_addr: + default: 0x43 + fet_reg_mask: + default: 0x0001 + fet_disconnect_val: + default: 0x0000 + fet_cfet_mask: + default: 0x0002 + fet_cfet_off_val: + default: 0x0000 - # Battery info - voltage_max: - default: 17600 - voltage_normal: - default: 15000 - voltage_min: - default: 12000 - precharge_current: - default: 256 - start_charging_min_c: - default: 0 - start_charging_max_c: - default: 50 - charging_min_c: - default: 0 - charging_max_c: - default: 60 - discharging_min_c: - default: -20 - discharging_max_c: - default: 60 + # Battery info + voltage_max: + default: 17600 + voltage_normal: + default: 15000 + voltage_min: + default: 12000 + precharge_current: + default: 256 + start_charging_min_c: + default: 0 + start_charging_max_c: + default: 50 + charging_min_c: + default: 0 + charging_max_c: + default: 60 + discharging_min_c: + default: -20 + discharging_max_c: + default: 60 diff --git a/zephyr/dts/bindings/power/ap-pwrseq-sub-states.yaml b/zephyr/dts/bindings/power/ap-pwrseq-sub-states.yaml index f6570be9fb..8632b7e7b5 100644 --- a/zephyr/dts/bindings/power/ap-pwrseq-sub-states.yaml +++ b/zephyr/dts/bindings/power/ap-pwrseq-sub-states.yaml @@ -2,12 +2,10 @@ # SPDX-License-Identifier: Apache-2.0 description: | - Define additional substates to be included in state machine. + Define additional substates to be included in state machine. Use corresponding + macros to provide action handlers. compatible: "ap-pwrseq-sub-states" -description: | - String array of additional substates, use corresponding macros to provide - action handlers. properties: chipset: type: string-array diff --git a/zephyr/test/drivers/testcase.yaml b/zephyr/test/drivers/testcase.yaml index 807ce4b8bb..b3746f9556 100644 --- a/zephyr/test/drivers/testcase.yaml +++ b/zephyr/test/drivers/testcase.yaml @@ -200,7 +200,9 @@ tests: - CONFIG_POWER_SEQUENCE_MOCK=y - CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y drivers.ps8xxx: - extra_args: CONF_FILE="prj.conf;ps8xxx/prj.conf" DTC_OVERLAY_FILE="./boards/native_posix.overlay;./ps8xxx/usbc.dts" + extra_args: > + CONF_FILE="prj.conf;ps8xxx/prj.conf" + DTC_OVERLAY_FILE="./boards/native_posix.overlay;./ps8xxx/usbc.dts" extra_configs: - CONFIG_LINK_TEST_SUITE_PS8XXX=y drivers.rt9490: @@ -278,7 +280,8 @@ tests: extra_configs: - CONFIG_LINK_TEST_SUITE_USBC_CONSOLE_PD=y drivers.usbc_console_pd_legacy: - extra_args: DTC_OVERLAY_FILE="default/boards/native_posix.overlay;./usbc_console_pd/usbc_legacy.dts" + extra_args: > + DTC_OVERLAY_FILE="default/boards/native_posix.overlay;./usbc_console_pd/usbc_legacy.dts" extra_configs: - CONFIG_LINK_TEST_SUITE_USBC_CONSOLE_PD=y - CONFIG_PLATFORM_EC_TCPC_INTERRUPT=n -- cgit v1.2.1