diff options
author | Wealian Liao <whliao@nuvoton.corp-partner.google.com> | 2022-01-27 11:03:07 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2022-01-28 18:46:18 +0000 |
commit | 0e31915cdf87eb6b66d35cd7ab082f901297d1ee (patch) | |
tree | 83ea487f6420484f8f6a2b54afcb7f5dedab7af3 | |
parent | 1e471003b7c82cc09503ffa0b01e3718f41ba3a0 (diff) | |
download | chrome-ec-0e31915cdf87eb6b66d35cd7ab082f901297d1ee.tar.gz |
zephyr: flash: Rename cros-ec,flash to cros-ec,flash-controller
Rename cros-ec,flash to cros-ec,flash-controller. So we can distinguish
the flash and flash-controller node.
BUG=b:216385443
BRANCH=none
TEST=zmake testall
Signed-off-by: Wealian Liao <whliao@nuvoton.corp-partner.google.com>
Change-Id: Ibd892a903f6efab2729961681267c6c98eb5762d
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3419434
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
-rw-r--r-- | zephyr/include/cros/ite/it8xxx2.dtsi | 2 | ||||
-rw-r--r-- | zephyr/include/cros/nuvoton/npcx.dtsi | 2 | ||||
-rw-r--r-- | zephyr/shim/src/flash.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/zephyr/include/cros/ite/it8xxx2.dtsi b/zephyr/include/cros/ite/it8xxx2.dtsi index a6a4d89e1c..d34fe6a499 100644 --- a/zephyr/include/cros/ite/it8xxx2.dtsi +++ b/zephyr/include/cros/ite/it8xxx2.dtsi @@ -10,7 +10,7 @@ chosen { cros-ec,bbram = &bbram; cros-ec,espi = &espi0; - cros-ec,flash = &fiu0; + cros-ec,flash-controller = &fiu0; cros-ec,raw-kb = &cros_kb_raw; cros-ec,watchdog = &twd0; }; diff --git a/zephyr/include/cros/nuvoton/npcx.dtsi b/zephyr/include/cros/nuvoton/npcx.dtsi index 44b3433459..a5c8a7433a 100644 --- a/zephyr/include/cros/nuvoton/npcx.dtsi +++ b/zephyr/include/cros/nuvoton/npcx.dtsi @@ -13,7 +13,7 @@ chosen { cros-ec,bbram = &bbram; cros-ec,espi = &espi0; - cros-ec,flash = &fiu0; + cros-ec,flash-controller = &fiu0; cros-ec,raw-kb = &cros_kb_raw; cros-ec,watchdog = &twd0; }; diff --git a/zephyr/shim/src/flash.c b/zephyr/shim/src/flash.c index ddd1b0c8ef..31f4c3d03b 100644 --- a/zephyr/shim/src/flash.c +++ b/zephyr/shim/src/flash.c @@ -16,10 +16,10 @@ LOG_MODULE_REGISTER(shim_flash, LOG_LEVEL_ERR); -#if !DT_HAS_CHOSEN(cros_ec_flash) -#error "cros-ec,flash device must be chosen" +#if !DT_HAS_CHOSEN(cros_ec_flash_controller) +#error "cros-ec,flash-controller device must be chosen" #else -#define cros_flash_dev DEVICE_DT_GET(DT_CHOSEN(cros_ec_flash)) +#define cros_flash_dev DEVICE_DT_GET(DT_CHOSEN(cros_ec_flash_controller)) #endif #if !DT_HAS_CHOSEN(zephyr_flash_controller) #error "zephyr,flash-controller device must be chosen" |