diff options
author | Andrew McRae <amcrae@google.com> | 2022-01-15 22:52:43 +1100 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2022-01-18 23:11:14 +0000 |
commit | d70d93b3a27c73ff6852e584311ee59a60919a94 (patch) | |
tree | bfc563b3dc9d8075cd6b319421922b6be2dde27f | |
parent | 60afc59dcb156eb64efab40eae005b60b663e197 (diff) | |
download | chrome-ec-d70d93b3a27c73ff6852e584311ee59a60919a94.tar.gz |
zephyr: Rename named-chi-fw-config to cros-ec,cbi-fw-config
Fix naming of FW_CONFIG DTS bindings
BUG=b:212758472
TEST=zmake testall
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: I0a73ae0623a0a327068b341d8c809cee6c8a8944
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3391503
Reviewed-by: Jeremy Bettis <jbettis@chromium.org>
-rw-r--r-- | zephyr/dts/bindings/cbi/cros-ec-cbi-fw-config-value.yaml (renamed from zephyr/dts/bindings/cbi/named-cbi-fw-config-value.yaml) | 4 | ||||
-rw-r--r-- | zephyr/dts/bindings/cbi/cros-ec-cbi-fw-config.yaml (renamed from zephyr/dts/bindings/cbi/named-cbi-fw-config.yaml) | 10 | ||||
-rw-r--r-- | zephyr/include/drivers/cros_cbi.h | 4 | ||||
-rw-r--r-- | zephyr/projects/nissa/cbi.dts | 8 | ||||
-rw-r--r-- | zephyr/test/drivers/overlay.dts | 8 |
5 files changed, 17 insertions, 17 deletions
diff --git a/zephyr/dts/bindings/cbi/named-cbi-fw-config-value.yaml b/zephyr/dts/bindings/cbi/cros-ec-cbi-fw-config-value.yaml index 5d7c48604b..1c298cc355 100644 --- a/zephyr/dts/bindings/cbi/named-cbi-fw-config-value.yaml +++ b/zephyr/dts/bindings/cbi/cros-ec-cbi-fw-config-value.yaml @@ -4,9 +4,9 @@ description: Possible CBI FW_CONFIG individual field values. - It has to be defined as a grandchild on the "named-cbi-fw-config" nodes + It has to be defined as a grandchild on the "cros-ec,cbi-fw-config" nodes -compatible: "named-cbi-fw-config-value" +compatible: "cros-ec,cbi-fw-config-value" properties: enum-name: diff --git a/zephyr/dts/bindings/cbi/named-cbi-fw-config.yaml b/zephyr/dts/bindings/cbi/cros-ec-cbi-fw-config.yaml index c8871ddb00..8412c65832 100644 --- a/zephyr/dts/bindings/cbi/named-cbi-fw-config.yaml +++ b/zephyr/dts/bindings/cbi/cros-ec-cbi-fw-config.yaml @@ -4,11 +4,11 @@ description: CBI Firmware Config fields (FW_CONFIG) -compatible: "named-cbi-fw-config" +compatible: "cros-ec,cbi-fw-config" child-binding: description: - CBI Firmware Config fields definition. + ChromeOS 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: @@ -29,7 +29,7 @@ child-binding: # Example: # # cbi-fw-config { -# compatible = "named-cbi-fw-config"; +# compatible = "cros-ec,cbi-fw-config"; # # fan { # enum-name = "FAN"; @@ -37,11 +37,11 @@ child-binding: # size = <1>; # fan_absent { # enum-name = "ABSENT" -# compatible = "named-cbi-fw-config-value"; +# compatible = "cros-ec,cbi-fw-config-value"; # value = <0>; # fan_present { # enum-name = "PRESENT" -# compatible = "named-cbi-fw-config-value"; +# compatible = "cros-ec,cbi-fw-config-value"; # value = <1>; # }; # }; diff --git a/zephyr/include/drivers/cros_cbi.h b/zephyr/include/drivers/cros_cbi.h index 15c94bcb19..906f2c5825 100644 --- a/zephyr/include/drivers/cros_cbi.h +++ b/zephyr/include/drivers/cros_cbi.h @@ -39,8 +39,8 @@ enum cbi_ssfc_value_id { * Macros to help generate the enum list of field and value names * for the FW_CONFIG CBI data. */ -#define CBI_FW_CONFIG_COMPAT named_cbi_fw_config -#define CBI_FW_CONFIG_VALUE_COMPAT named_cbi_fw_config_value +#define CBI_FW_CONFIG_COMPAT cros_ec_cbi_fw_config +#define CBI_FW_CONFIG_VALUE_COMPAT cros_ec_cbi_fw_config_value /* * Retrieve the enum-name property for this node. diff --git a/zephyr/projects/nissa/cbi.dts b/zephyr/projects/nissa/cbi.dts index 363a9c6807..0d44ed027a 100644 --- a/zephyr/projects/nissa/cbi.dts +++ b/zephyr/projects/nissa/cbi.dts @@ -5,7 +5,7 @@ / { nissa-fw-config { - compatible = "named-cbi-fw-config"; + compatible = "cros-ec,cbi-fw-config"; /* * FW_CONFIG field to indicate which sub-board @@ -17,17 +17,17 @@ size = <2>; sub-board-1 { - compatible = "named-cbi-fw-config-value"; + compatible = "cros-ec,cbi-fw-config-value"; enum-name = "FW_SUB_BOARD_1"; value = <1>; }; sub-board-2 { - compatible = "named-cbi-fw-config-value"; + compatible = "cros-ec,cbi-fw-config-value"; enum-name = "FW_SUB_BOARD_2"; value = <2>; }; sub-board-3 { - compatible = "named-cbi-fw-config-value"; + compatible = "cros-ec,cbi-fw-config-value"; enum-name = "FW_SUB_BOARD_3"; value = <3>; }; diff --git a/zephyr/test/drivers/overlay.dts b/zephyr/test/drivers/overlay.dts index bc388a6912..23dd61cde2 100644 --- a/zephyr/test/drivers/overlay.dts +++ b/zephyr/test/drivers/overlay.dts @@ -198,18 +198,18 @@ }; cbi-fw-config { - compatible = "named-cbi-fw-config"; + compatible = "cros-ec,cbi-fw-config"; field-1 { enum-name = "FW_CONFIG_FIELD_1"; start = <0>; size = <2>; val-0 { - compatible = "named-cbi-fw-config-value"; + compatible = "cros-ec,cbi-fw-config-value"; enum-name = "FW_FIELD_1_A"; value = <0>; }; val-1 { - compatible = "named-cbi-fw-config-value"; + compatible = "cros-ec,cbi-fw-config-value"; enum-name = "FW_FIELD_1_B"; value = <1>; }; @@ -219,7 +219,7 @@ start = <5>; size = <1>; val-1 { - compatible = "named-cbi-fw-config-value"; + compatible = "cros-ec,cbi-fw-config-value"; enum-name = "FW_FIELD_2_X"; value = <1>; }; |