diff options
| author | Fabio Baltieri <fabiobaltieri@google.com> | 2022-07-15 13:57:20 +0000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-18 11:41:33 +0000 |
| commit | 3f06eaf773f2c763390a06d64a6ce423795edeca (patch) | |
| tree | eb8991c067023ee362bf1e49b208156518abdcc2 | |
| parent | 71cfa4bb71cd5f15ea9ef222d4f0c9022d0caa61 (diff) | |
| download | chrome-ec-3f06eaf773f2c763390a06d64a6ce423795edeca.tar.gz | |
zephyr: flash: drop the label property
Does not look like this was used anywhere.
BRANCH=none
BUG=b:239165779
TEST=zmake testall
Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
Change-Id: Ia196dbea753f8790fd4e52a3ee505815ebd3afd5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3763910
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | zephyr/dts/bindings/cros_flash/cros-flash-controller.yaml | 4 | ||||
| -rw-r--r-- | zephyr/emul/emul_flash.c | 3 | ||||
| -rw-r--r-- | zephyr/include/cros/ite/it8xxx2.dtsi | 1 | ||||
| -rw-r--r-- | zephyr/include/cros/microchip/mec1727.dtsi | 1 | ||||
| -rw-r--r-- | zephyr/include/cros/microchip/mec172x.dtsi | 3 | ||||
| -rw-r--r-- | zephyr/include/cros/nuvoton/npcx.dtsi | 3 | ||||
| -rw-r--r-- | zephyr/test/drivers/overlay.dts | 1 |
7 files changed, 2 insertions, 14 deletions
diff --git a/zephyr/dts/bindings/cros_flash/cros-flash-controller.yaml b/zephyr/dts/bindings/cros_flash/cros-flash-controller.yaml index b9c8a9f149..9469a02004 100644 --- a/zephyr/dts/bindings/cros_flash/cros-flash-controller.yaml +++ b/zephyr/dts/bindings/cros_flash/cros-flash-controller.yaml @@ -6,7 +6,3 @@ include: base.yaml bus: crosflash - -properties: - label: - required: true diff --git a/zephyr/emul/emul_flash.c b/zephyr/emul/emul_flash.c index 0d1b691bca..e3c72c1c3d 100644 --- a/zephyr/emul/emul_flash.c +++ b/zephyr/emul/emul_flash.c @@ -17,8 +17,6 @@ LOG_MODULE_REGISTER(emul_flash); struct flash_emul_data {}; struct flash_emul_cfg { - /** Label of the device being emulated */ - const char *dev_label; /** Pointer to run-time data */ struct flash_emul_data *data; }; @@ -121,7 +119,6 @@ static int flash_emul_init(const struct device *dev) static struct flash_emul_data flash_emul_data_##n = {}; \ \ static const struct flash_emul_cfg flash_emul_cfg_##n = { \ - .dev_label = DT_INST_LABEL(n), \ .data = &flash_emul_data_##n, \ }; \ DEVICE_DT_INST_DEFINE(n, flash_emul_init, NULL, &flash_emul_data_##n, \ diff --git a/zephyr/include/cros/ite/it8xxx2.dtsi b/zephyr/include/cros/ite/it8xxx2.dtsi index 26060c5ed4..1d54ee5e4c 100644 --- a/zephyr/include/cros/ite/it8xxx2.dtsi +++ b/zephyr/include/cros/ite/it8xxx2.dtsi @@ -77,7 +77,6 @@ fiu0: cros-flash@80000000 { compatible = "ite,it8xxx2-cros-flash"; reg = <0x80000000 0x100000>; - label = "FLASH"; }; cros_kb_raw: cros-kb-raw@f01d00 { diff --git a/zephyr/include/cros/microchip/mec1727.dtsi b/zephyr/include/cros/microchip/mec1727.dtsi index 340cff1956..f436709daa 100644 --- a/zephyr/include/cros/microchip/mec1727.dtsi +++ b/zephyr/include/cros/microchip/mec1727.dtsi @@ -75,6 +75,5 @@ fiu0: cros-flash { compatible = "microchip,xec-cros-flash"; - label = "INTERNAL_FLASH"; }; }; diff --git a/zephyr/include/cros/microchip/mec172x.dtsi b/zephyr/include/cros/microchip/mec172x.dtsi index 6833fa57d0..6dcc563f34 100644 --- a/zephyr/include/cros/microchip/mec172x.dtsi +++ b/zephyr/include/cros/microchip/mec172x.dtsi @@ -69,9 +69,8 @@ }; }; - fiu0: cros-flash{ + fiu0: cros-flash { compatible = "microchip,xec-cros-flash"; - label = "INTERNAL_FLASH"; }; /* diff --git a/zephyr/include/cros/nuvoton/npcx.dtsi b/zephyr/include/cros/nuvoton/npcx.dtsi index 094f5ff901..0ccb6a7ebe 100644 --- a/zephyr/include/cros/nuvoton/npcx.dtsi +++ b/zephyr/include/cros/nuvoton/npcx.dtsi @@ -68,9 +68,8 @@ }; }; - fiu0: cros-flash{ + fiu0: cros-flash { compatible = "nuvoton,npcx-cros-flash"; - label = "INTERNAL_FLASH"; }; soc { diff --git a/zephyr/test/drivers/overlay.dts b/zephyr/test/drivers/overlay.dts index 3577acdb6f..d3686be4c8 100644 --- a/zephyr/test/drivers/overlay.dts +++ b/zephyr/test/drivers/overlay.dts @@ -765,7 +765,6 @@ cros_flash: cros-flash { compatible = "cros-ec,flash-emul"; - label = "FLASH"; }; }; |