zephyr: npcx: rename cros/nuvoton/npcx.dtsi to npcx7

The the upstream changes to support npcx9 there have been some changes
to the nuvoton dtsi structure. These allow us to now depend on the
more generic npcx7.dtsi instead of the specific npcx7m6fb.dtsi. It also
moves some of the common code of the npcx family away from the more
specific npcx7.

BRANCH=none
BUG=b:188605676
TEST=build volteer, trogdor, and kohaku

Change-Id: I552bad25c2d9392059ab5dcb0684a2bdac01d545
Signed-off-by: Yuval Peress <peress@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2909752
Reviewed-by: Denis Brockus <dbrockus@chromium.org>

5 files changed, 57 insertions, 42 deletions

diff --git a/zephyr/include/cros/nuvoton/npcx.dtsi b/zephyr/include/cros/nuvoton/npcx.dtsi
index e24fa0ee15..2c8e751f44 100644
--- a/zephyr/include/cros/nuvoton/npcx.dtsi
+++ b/zephyr/include/cros/nuvoton/npcx.dtsi
@@ -7,7 +7,7 @@
 /dts-v1/;
 
 #include <cros/binman.dtsi>
-#include <nuvoton/npcx7.dtsi>
+#include <nuvoton/npcx.dtsi>
 
 / {
 
@@ -73,49 +73,11 @@
 			label = "BBRAM";
 		};
 
-		dbg: dbg@400c3074 {
-			compatible = "nuvoton,npcx-cros-dbg";
-			reg = <0x400c3074 0x0C>;
-			pinctrl-0 = <&alt5_njen0_en>;
-			label = "DBG";
-			status = "disabled";
-		};
-
 		mtc: mtc@400b7000 {
 			compatible = "nuvoton,npcx-cros-mtc";
 			reg = <0x400b7000 0x2000>;
 			mtc-alarm = <&wui_mtc>;
 			label = "MTC";
 		};
-
-		shi: shi@4000f000 {
-			compatible = "nuvoton,npcx-cros-shi";
-			reg = <0x4000f000 0x120>;
-			interrupts = <18 1>;
-			clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL5 1>;
-			pinctrl-0 = <&altc_shi_sl>;
-			shi-cs-wui =<&wui_io53>;
-			label = "SHI";
-		};
 	};
-
-	power-states {
-		suspend_to_idle_instant: suspend_to_idle_instant {
-			compatible = "zephyr,power-state";
-			power-state-name = "suspend-to-idle";
-			substate-id = <0>;
-			min-residency-us = <500>;
-		};
-
-		suspend_to_idle_normal: suspend_to_idle_normal {
-			compatible = "zephyr,power-state";
-			power-state-name = "suspend-to-idle";
-			substate-id = <1>;
-			min-residency-us = <200100>;
-		};
-	};
-};
-
-&cpu0 {
-	cpu-power-states = <&suspend_to_idle_instant &suspend_to_idle_normal>;
 };
diff --git a/zephyr/include/cros/nuvoton/npcx7.dtsi b/zephyr/include/cros/nuvoton/npcx7.dtsi
new file mode 100644
index 0000000000..5d1b9f4acf
--- /dev/null
+++ b/zephyr/include/cros/nuvoton/npcx7.dtsi
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2021 The Chromium OS Authors
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/dts-v1/;
+
+#include <cros/nuvoton/npcx.dtsi>
+
+/ {
+
+	soc {
+
+		dbg: dbg@400c3074 {
+			compatible = "nuvoton,npcx-cros-dbg";
+			reg = <0x400c3074 0x0C>;
+			pinctrl-0 = <&alt5_njen0_en>;
+			label = "DBG";
+			status = "disabled";
+		};
+
+		shi: shi@4000f000 {
+			compatible = "nuvoton,npcx-cros-shi";
+			reg = <0x4000f000 0x120>;
+			interrupts = <18 1>;
+			clocks = <&pcc NPCX_CLOCK_BUS_APB3 NPCX_PWDWN_CTL5 1>;
+			pinctrl-0 = <&altc_shi_sl>;
+			shi-cs-wui =<&wui_io53>;
+			label = "SHI";
+		};
+	};
+
+	power-states {
+		suspend_to_idle_instant: suspend_to_idle_instant {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-idle";
+			substate-id = <0>;
+			min-residency-us = <500>;
+		};
+
+		suspend_to_idle_normal: suspend_to_idle_normal {
+			compatible = "zephyr,power-state";
+			power-state-name = "suspend-to-idle";
+			substate-id = <1>;
+			min-residency-us = <200100>;
+		};
+	};
+};
+
+&cpu0 {
+	cpu-power-states = <&suspend_to_idle_instant &suspend_to_idle_normal>;
+};
diff --git a/zephyr/projects/kohaku/boards/arm/kohaku/kohaku.dts b/zephyr/projects/kohaku/boards/arm/kohaku/kohaku.dts
index a2cbbde6c4..73507e98ec 100644
--- a/zephyr/projects/kohaku/boards/arm/kohaku/kohaku.dts
+++ b/zephyr/projects/kohaku/boards/arm/kohaku/kohaku.dts
@@ -5,7 +5,7 @@
 
 /dts-v1/;
 
-#include <cros/nuvoton/npcx.dtsi>
+#include <cros/nuvoton/npcx7.dtsi>
 #include <dt-bindings/gpio_defines.h>
 #include <nuvoton/npcx7m6fc.dtsi>
 
diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts
index 8eb41e67d9..11d498018d 100644
--- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts
+++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts
@@ -5,7 +5,7 @@
 
 /dts-v1/;
 
-#include <cros/nuvoton/npcx.dtsi>
+#include <cros/nuvoton/npcx7.dtsi>
 #include <dt-bindings/adc/adc.h>
 #include <dt-bindings/gpio_defines.h>
 #include <nuvoton/npcx7m6fc.dtsi>
diff --git a/zephyr/projects/volteer/boards/arm/volteer/volteer.dts b/zephyr/projects/volteer/boards/arm/volteer/volteer.dts
index 1356a5e1ba..e560ba682c 100644
--- a/zephyr/projects/volteer/boards/arm/volteer/volteer.dts
+++ b/zephyr/projects/volteer/boards/arm/volteer/volteer.dts
@@ -6,7 +6,7 @@
 
 /dts-v1/;
 
-#include <cros/nuvoton/npcx.dtsi>
+#include <cros/nuvoton/npcx7.dtsi>
 #include <dt-bindings/adc/adc.h>
 #include <dt-bindings/charger/intersil_isl9241.h>
 #include <dt-bindings/gpio_defines.h>