diff options
| author | Ting Shen <phoenixshen@google.com> | 2023-01-18 18:23:53 +0800 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-01-19 05:48:52 +0000 |
| commit | 266693ffe32bf59aa91d7f021e08bdd5aa9773b0 (patch) | |
| tree | a0f74ac7d8b36a32017da702e5e0f36ddd66de09 | |
| parent | aba64fcb3189c2defc8aec1c9b954ee7d8d0e18e (diff) | |
| download | chrome-ec-266693ffe32bf59aa91d7f021e08bdd5aa9773b0.tar.gz | |
zephyr: npcx: move npcx-cros-shi node to the bottom of dts
The /delete-node/ line need to be placed after the shi node definition
in dts/arm/nuvoton/npcx.dtsi.
BUG=b:265763662
TEST=manually checked packer/source.dts, make sure the shi node has
compatible string "nuvoton,npcx-cros-shi".
BRANCH=none
Change-Id: Ibd6deb7f8571e20a267c5c2912b429160b49c424
Signed-off-by: Ting Shen <phoenixshen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4176184
Tested-by: Ting Shen <phoenixshen@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | zephyr/boards/arm/npcx7/npcx7.dts | 13 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx9/npcx9.dtsi | 13 | ||||
| -rw-r--r-- | zephyr/boards/arm/npcx_evb/npcx_evb.dtsi | 13 | ||||
| -rw-r--r-- | zephyr/include/cros/nuvoton/npcx.dtsi | 14 |
4 files changed, 39 insertions, 14 deletions
diff --git a/zephyr/boards/arm/npcx7/npcx7.dts b/zephyr/boards/arm/npcx7/npcx7.dts index a4f0646001..cfe67a1b66 100644 --- a/zephyr/boards/arm/npcx7/npcx7.dts +++ b/zephyr/boards/arm/npcx7/npcx7.dts @@ -45,6 +45,19 @@ /* Override keyboard scanning */ soc { /delete-node/ kscan@400a3000; + /* TODO(b/265198571): Migrate Zephyr EC builds to upstream SHI + * drivers. + */ + /delete-node/ shi@4000f000; + shi: shi@4000f000 { + compatible = "nuvoton,npcx-cros-shi"; + reg = <0x4000f000 0x120>; + interrupts = <18 1>; + clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL5 1>; + shi-cs-wui =<&wui_io53>; + label = "SHI"; + status = "disabled"; + }; }; }; diff --git a/zephyr/boards/arm/npcx9/npcx9.dtsi b/zephyr/boards/arm/npcx9/npcx9.dtsi index 113cecc173..8f630ae86b 100644 --- a/zephyr/boards/arm/npcx9/npcx9.dtsi +++ b/zephyr/boards/arm/npcx9/npcx9.dtsi @@ -40,6 +40,19 @@ /* Override keyboard scanning */ soc { /delete-node/ kscan@400a3000; + /* TODO(b/265198571): Migrate Zephyr EC builds to upstream SHI + * drivers. + */ + /delete-node/ shi@4000f000; + shi: shi@4000f000 { + compatible = "nuvoton,npcx-cros-shi"; + reg = <0x4000f000 0x120>; + interrupts = <18 1>; + clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL5 1>; + shi-cs-wui =<&wui_io53>; + label = "SHI"; + status = "disabled"; + }; }; }; diff --git a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi index 5debb86381..1f7eb98356 100644 --- a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi +++ b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi @@ -70,6 +70,19 @@ /* Override keyboard scanning */ soc { /delete-node/ kscan@400a3000; + /* TODO(b/265198571): Migrate Zephyr EC builds to upstream SHI + * drivers. + */ + /delete-node/ shi@4000f000; + shi: shi@4000f000 { + compatible = "nuvoton,npcx-cros-shi"; + reg = <0x4000f000 0x120>; + interrupts = <18 1>; + clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL5 1>; + shi-cs-wui =<&wui_io53>; + label = "SHI"; + status = "disabled"; + }; }; }; diff --git a/zephyr/include/cros/nuvoton/npcx.dtsi b/zephyr/include/cros/nuvoton/npcx.dtsi index 02bfba5b52..d2e7a9e19f 100644 --- a/zephyr/include/cros/nuvoton/npcx.dtsi +++ b/zephyr/include/cros/nuvoton/npcx.dtsi @@ -88,20 +88,6 @@ reg = <0x400b7000 0x2000>; mtc-alarm = <&wui_mtc>; }; - - /* TODO(b/265198571): Migrate Zephyr EC builds to upstream SHI - * drivers. - */ - /delete-node/ shi@4000f000; - shi: shi@4000f000 { - compatible = "nuvoton,npcx-cros-shi"; - reg = <0x4000f000 0x120>; - interrupts = <18 1>; - clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL5 1>; - shi-cs-wui =<&wui_io53>; - label = "SHI"; - status = "disabled"; - }; }; power-states { |