diff options
| author | Michał Barnaś <mb@semihalf.com> | 2023-01-19 18:12:58 +0100 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-02-14 19:06:32 +0000 |
| commit | 8b79c53a600731ea68129896bb3d93c0d248da32 (patch) | |
| tree | 3136d6d31f06ad4754ad87be55cb462f5b8c2432 | |
| parent | b34c7aa7821d7b3e51587a8d35d3fc82fc3104ca (diff) | |
| download | chrome-ec-8b79c53a600731ea68129896bb3d93c0d248da32.tar.gz | |
Revert "zephyr: npcx: move npcx-cros-shi node to the bottom of dts"
This reverts commit 266693ffe32bf59aa91d7f021e08bdd5aa9773b0.
The proper fix requires to revert this change.
BRANCH=main
BUG=b:265763662
TEST=run the host commands test on affected boards
Cq-Depend: chromium:4180585
Change-Id: I3c9d036d72f9951479d7a745539c5dcef2b45516
Signed-off-by: Michał Barnaś <mb@semihalf.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4180584
Tested-by: Michał Barnaś <barnas@google.com>
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Michał Barnaś <barnas@google.com>
| -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, 14 insertions, 39 deletions
diff --git a/zephyr/boards/arm/npcx7/npcx7.dts b/zephyr/boards/arm/npcx7/npcx7.dts index cfe67a1b66..a4f0646001 100644 --- a/zephyr/boards/arm/npcx7/npcx7.dts +++ b/zephyr/boards/arm/npcx7/npcx7.dts @@ -45,19 +45,6 @@ /* 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 8f630ae86b..113cecc173 100644 --- a/zephyr/boards/arm/npcx9/npcx9.dtsi +++ b/zephyr/boards/arm/npcx9/npcx9.dtsi @@ -40,19 +40,6 @@ /* 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 1f7eb98356..5debb86381 100644 --- a/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi +++ b/zephyr/boards/arm/npcx_evb/npcx_evb.dtsi @@ -70,19 +70,6 @@ /* 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 1237581158..b529299b6a 100644 --- a/zephyr/include/cros/nuvoton/npcx.dtsi +++ b/zephyr/include/cros/nuvoton/npcx.dtsi @@ -86,6 +86,20 @@ 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 { |