corsola: zephyr project organization

Firstly, renames the .dts, .conf and places to the project folder.

For the components excluding battery and led, rename them by the rule:

- kingler -> npcx
- krabby -> ite
- prj.conf -> program.conf
- prj_npcx|ite.conf -> npcx|ite_program.conf
- move prj_*.conf to $project/project.conf
- rename .dts to .dtsi
- move consolidate project dts to $project/project.overlay

There will be following CLs for the next step organizing.
- clean up krabby family dtsi sharing
- add CMakeLists.txt for projects

reference: go/zephyr-projects

BUG=b:254097516
TEST=zmake compare-binaries -a
BRANCH=corsola

Change-Id: Ia4d9fe8750300185922f7e013fbdb4bf08265de2
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4022563
Auto-Submit: Eric Yilun Lin <yllin@google.com>
Tested-by: Eric Yilun Lin <yllin@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>

66 files changed, 126 insertions, 114 deletions

diff --git a/zephyr/program/corsola/BUILD.py b/zephyr/program/corsola/BUILD.py
index 91bd8ab062..3b22dbe0ad 100644
--- a/zephyr/program/corsola/BUILD.py
+++ b/zephyr/program/corsola/BUILD.py
@@ -10,133 +10,38 @@
 def register_corsola_project(
     project_name,
     chip="it81202bx",
-    extra_dts_overlays=(),
-    extra_kconfig_files=(),
 ):
     """Register a variant of corsola."""
     register_func = register_binman_project
     if chip.startswith("npcx"):
         register_func = register_npcx_project
 
+    chip_kconfig = {"it81202bx": "ite", "npcx9m3f": "npcx"}[chip]
+
     register_func(
         project_name=project_name,
         zephyr_board=chip,
-        dts_overlays=[
-            here / "common.dts",
-            here / "power_signal.dts",
-            here / "usba.dts",
-            *extra_dts_overlays,
+        dts_overlays=[here / project_name / "project.overlay"],
+        kconfig_files=[
+            here / "program.conf",
+            here / f"{chip_kconfig}_program.conf",
+            here / project_name / "project.conf",
         ],
-        kconfig_files=[here / "prj.conf", *extra_kconfig_files],
     )
 
 
-register_corsola_project(
-    "krabby",
-    extra_dts_overlays=[
-        here / "adc_krabby.dts",
-        here / "battery_krabby.dts",
-        here / "gpio_krabby.dts",
-        here / "keyboard_krabby.dts",
-        here / "i2c_krabby.dts",
-        here / "interrupts_krabby.dts",
-        here / "led_krabby.dts",
-        here / "motionsense_krabby.dts",
-        here / "usbc_krabby.dts",
-    ],
-    extra_kconfig_files=[
-        here / "prj_it81202_base.conf",
-        here / "prj_krabby.conf",
-    ],
-)
+register_corsola_project("krabby")
 
 register_corsola_project(
     project_name="kingler",
     chip="npcx9m3f",
-    extra_dts_overlays=[
-        here / "adc_kingler.dts",
-        here / "battery_kingler.dts",
-        here / "host_interface_npcx.dts",
-        here / "i2c_kingler.dts",
-        here / "interrupts_kingler.dts",
-        here / "gpio_kingler.dts",
-        here / "npcx_keyboard.dts",
-        here / "led_kingler.dts",
-        here / "motionsense_kingler.dts",
-        here / "usbc_kingler.dts",
-        here / "default_gpio_pinctrl_kingler.dts",
-    ],
-    extra_kconfig_files=[
-        here / "prj_npcx993_base.conf",
-        here / "prj_kingler.conf",
-    ],
 )
 
 register_corsola_project(
     project_name="steelix",
     chip="npcx9m3f",
-    extra_dts_overlays=[
-        here / "adc_kingler.dts",
-        here / "battery_steelix.dts",
-        here / "host_interface_npcx.dts",
-        here / "i2c_kingler.dts",
-        here / "interrupts_kingler.dts",
-        here / "interrupts_steelix.dts",
-        here / "cbi_steelix.dts",
-        here / "gpio_steelix.dts",
-        here / "npcx_keyboard.dts",
-        here / "keyboard_steelix.dts",
-        here / "led_steelix.dts",
-        here / "motionsense_kingler.dts",
-        here / "motionsense_steelix.dts",
-        here / "usba_steelix.dts",
-        here / "usbc_kingler.dts",
-        here / "default_gpio_pinctrl_kingler.dts",
-    ],
-    extra_kconfig_files=[
-        here / "prj_npcx993_base.conf",
-        here / "prj_steelix.conf",
-    ],
 )
 
+register_corsola_project("tentacruel")
 
-register_corsola_project(
-    "tentacruel",
-    extra_dts_overlays=[
-        here / "adc_tentacruel.dts",
-        here / "battery_tentacruel.dts",
-        here / "cbi_tentacruel.dts",
-        here / "gpio_tentacruel.dts",
-        here / "keyboard_krabby.dts",
-        here / "i2c_tentacruel.dts",
-        here / "interrupts_tentacruel.dts",
-        here / "led_tentacruel.dts",
-        here / "motionsense_tentacruel.dts",
-        here / "usbc_tentacruel.dts",
-        here / "thermistor_tentacruel.dts",
-    ],
-    extra_kconfig_files=[
-        here / "prj_it81202_base.conf",
-        here / "prj_tentacruel.conf",
-    ],
-)
-
-register_corsola_project(
-    "magikarp",
-    extra_dts_overlays=[
-        here / "adc_magikarp.dts",
-        here / "battery_magikarp.dts",
-        here / "cbi_magikarp.dts",
-        here / "gpio_magikarp.dts",
-        here / "keyboard_krabby.dts",
-        here / "i2c_magikarp.dts",
-        here / "interrupts_magikarp.dts",
-        here / "led_magikarp.dts",
-        here / "motionsense_magikarp.dts",
-        here / "usbc_magikarp.dts",
-    ],
-    extra_kconfig_files=[
-        here / "prj_it81202_base.conf",
-        here / "prj_magikarp.conf",
-    ],
-)
+register_corsola_project("magikarp")
diff --git a/zephyr/program/corsola/adc_magikarp.dts b/zephyr/program/corsola/adc_magikarp.dtsi
index 358af6f0f4..358af6f0f4 100644
--- a/zephyr/program/corsola/adc_magikarp.dts
+++ b/zephyr/program/corsola/adc_magikarp.dtsi
diff --git a/zephyr/program/corsola/adc_tentacruel.dts b/zephyr/program/corsola/adc_tentacruel.dtsi
index 7ab6f8817b..7ab6f8817b 100644
--- a/zephyr/program/corsola/adc_tentacruel.dts
+++ b/zephyr/program/corsola/adc_tentacruel.dtsi
diff --git a/zephyr/program/corsola/battery_kingler.dts b/zephyr/program/corsola/battery_kingler.dtsi
index b01fb8a46d..b01fb8a46d 100644
--- a/zephyr/program/corsola/battery_kingler.dts
+++ b/zephyr/program/corsola/battery_kingler.dtsi
diff --git a/zephyr/program/corsola/battery_krabby.dts b/zephyr/program/corsola/battery_krabby.dtsi
index ce41859182..ce41859182 100644
--- a/zephyr/program/corsola/battery_krabby.dts
+++ b/zephyr/program/corsola/battery_krabby.dtsi
diff --git a/zephyr/program/corsola/battery_magikarp.dts b/zephyr/program/corsola/battery_magikarp.dtsi
index bbdd6ac0c5..bbdd6ac0c5 100644
--- a/zephyr/program/corsola/battery_magikarp.dts
+++ b/zephyr/program/corsola/battery_magikarp.dtsi
diff --git a/zephyr/program/corsola/battery_steelix.dts b/zephyr/program/corsola/battery_steelix.dtsi
index 594c83478c..594c83478c 100644
--- a/zephyr/program/corsola/battery_steelix.dts
+++ b/zephyr/program/corsola/battery_steelix.dtsi
diff --git a/zephyr/program/corsola/battery_tentacruel.dts b/zephyr/program/corsola/battery_tentacruel.dtsi
index f116c20a51..f116c20a51 100644
--- a/zephyr/program/corsola/battery_tentacruel.dts
+++ b/zephyr/program/corsola/battery_tentacruel.dtsi
diff --git a/zephyr/program/corsola/cbi_magikarp.dts b/zephyr/program/corsola/cbi_magikarp.dtsi
index 5eac6b82c6..5eac6b82c6 100644
--- a/zephyr/program/corsola/cbi_magikarp.dts
+++ b/zephyr/program/corsola/cbi_magikarp.dtsi
diff --git a/zephyr/program/corsola/cbi_steelix.dts b/zephyr/program/corsola/cbi_steelix.dtsi
index 6636b53a96..6636b53a96 100644
--- a/zephyr/program/corsola/cbi_steelix.dts
+++ b/zephyr/program/corsola/cbi_steelix.dtsi
diff --git a/zephyr/program/corsola/cbi_tentacruel.dts b/zephyr/program/corsola/cbi_tentacruel.dtsi
index 2cd4594417..2cd4594417 100644
--- a/zephyr/program/corsola/cbi_tentacruel.dts
+++ b/zephyr/program/corsola/cbi_tentacruel.dtsi
diff --git a/zephyr/program/corsola/common.dts b/zephyr/program/corsola/common.dtsi
index 001dcc7ce3..001dcc7ce3 100644
--- a/zephyr/program/corsola/common.dts
+++ b/zephyr/program/corsola/common.dtsi
diff --git a/zephyr/program/corsola/gpio_magikarp.dts b/zephyr/program/corsola/gpio_magikarp.dtsi
index cb9f6f1a0a..cb9f6f1a0a 100644
--- a/zephyr/program/corsola/gpio_magikarp.dts
+++ b/zephyr/program/corsola/gpio_magikarp.dtsi
diff --git a/zephyr/program/corsola/gpio_steelix.dts b/zephyr/program/corsola/gpio_steelix.dtsi
index 14120e6d7d..14120e6d7d 100644
--- a/zephyr/program/corsola/gpio_steelix.dts
+++ b/zephyr/program/corsola/gpio_steelix.dtsi
diff --git a/zephyr/program/corsola/gpio_tentacruel.dts b/zephyr/program/corsola/gpio_tentacruel.dtsi
index a9ac9e8eac..a9ac9e8eac 100644
--- a/zephyr/program/corsola/gpio_tentacruel.dts
+++ b/zephyr/program/corsola/gpio_tentacruel.dtsi
diff --git a/zephyr/program/corsola/i2c_krabby.dts b/zephyr/program/corsola/i2c_krabby.dtsi
index a873210ff7..a873210ff7 100644
--- a/zephyr/program/corsola/i2c_krabby.dts
+++ b/zephyr/program/corsola/i2c_krabby.dtsi
diff --git a/zephyr/program/corsola/i2c_magikarp.dts b/zephyr/program/corsola/i2c_magikarp.dtsi
index 45b7cf20fb..45b7cf20fb 100644
--- a/zephyr/program/corsola/i2c_magikarp.dts
+++ b/zephyr/program/corsola/i2c_magikarp.dtsi
diff --git a/zephyr/program/corsola/i2c_tentacruel.dts b/zephyr/program/corsola/i2c_tentacruel.dtsi
index e56119ff86..e56119ff86 100644
--- a/zephyr/program/corsola/i2c_tentacruel.dts
+++ b/zephyr/program/corsola/i2c_tentacruel.dtsi
diff --git a/zephyr/program/corsola/interrupts_magikarp.dts b/zephyr/program/corsola/interrupts_magikarp.dtsi
index 4f4e0ba100..4f4e0ba100 100644
--- a/zephyr/program/corsola/interrupts_magikarp.dts
+++ b/zephyr/program/corsola/interrupts_magikarp.dtsi
diff --git a/zephyr/program/corsola/interrupts_steelix.dts b/zephyr/program/corsola/interrupts_steelix.dtsi
index 816beb95f4..816beb95f4 100644
--- a/zephyr/program/corsola/interrupts_steelix.dts
+++ b/zephyr/program/corsola/interrupts_steelix.dtsi
diff --git a/zephyr/program/corsola/interrupts_tentacruel.dts b/zephyr/program/corsola/interrupts_tentacruel.dtsi
index 11229daf36..11229daf36 100644
--- a/zephyr/program/corsola/interrupts_tentacruel.dts
+++ b/zephyr/program/corsola/interrupts_tentacruel.dtsi
diff --git a/zephyr/program/corsola/adc_krabby.dts b/zephyr/program/corsola/ite_adc.dtsi
index be65e9eea7..be65e9eea7 100644
--- a/zephyr/program/corsola/adc_krabby.dts
+++ b/zephyr/program/corsola/ite_adc.dtsi
diff --git a/zephyr/program/corsola/gpio_krabby.dts b/zephyr/program/corsola/ite_gpio.dtsi
index 5f06609f43..5f06609f43 100644
--- a/zephyr/program/corsola/gpio_krabby.dts
+++ b/zephyr/program/corsola/ite_gpio.dtsi
diff --git a/zephyr/program/corsola/interrupts_krabby.dts b/zephyr/program/corsola/ite_interrupts.dtsi
index 3caf4660ae..3caf4660ae 100644
--- a/zephyr/program/corsola/interrupts_krabby.dts
+++ b/zephyr/program/corsola/ite_interrupts.dtsi
diff --git a/zephyr/program/corsola/keyboard_krabby.dts b/zephyr/program/corsola/ite_keyboard.dtsi
index b1a9af6330..b1a9af6330 100644
--- a/zephyr/program/corsola/keyboard_krabby.dts
+++ b/zephyr/program/corsola/ite_keyboard.dtsi
diff --git a/zephyr/program/corsola/motionsense_krabby.dts b/zephyr/program/corsola/ite_motionsense.dtsi
index 1c7d5b2df4..1c7d5b2df4 100644
--- a/zephyr/program/corsola/motionsense_krabby.dts
+++ b/zephyr/program/corsola/ite_motionsense.dtsi
diff --git a/zephyr/program/corsola/prj_it81202_base.conf b/zephyr/program/corsola/ite_program.conf
index 2a8b46bb28..2a8b46bb28 100644
--- a/zephyr/program/corsola/prj_it81202_base.conf
+++ b/zephyr/program/corsola/ite_program.conf
diff --git a/zephyr/program/corsola/usbc_krabby.dts b/zephyr/program/corsola/ite_usbc.dtsi
index a72864da35..a72864da35 100644
--- a/zephyr/program/corsola/usbc_krabby.dts
+++ b/zephyr/program/corsola/ite_usbc.dtsi
diff --git a/zephyr/program/corsola/keyboard_steelix.dts b/zephyr/program/corsola/keyboard_steelix.dtsi
index 9a0dca3e05..9a0dca3e05 100644
--- a/zephyr/program/corsola/keyboard_steelix.dts
+++ b/zephyr/program/corsola/keyboard_steelix.dtsi
diff --git a/zephyr/program/corsola/prj_kingler.conf b/zephyr/program/corsola/kingler/project.conf
index d7de991e93..d7de991e93 100644
--- a/zephyr/program/corsola/prj_kingler.conf
+++ b/zephyr/program/corsola/kingler/project.conf
diff --git a/zephyr/program/corsola/kingler/project.overlay b/zephyr/program/corsola/kingler/project.overlay
new file mode 100644
index 0000000000..baa3185616
--- /dev/null
+++ b/zephyr/program/corsola/kingler/project.overlay
@@ -0,0 +1,21 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Corsola program common DTS includes */
+
+#include "../common.dtsi"
+#include "../power_signal.dtsi"
+#include "../usba.dtsi"
+#include "../npcx_adc.dtsi"
+#include "../battery_kingler.dtsi"
+#include "../npcx_host_interface.dtsi"
+#include "../npcx_i2c.dtsi"
+#include "../npcx_interrupts.dtsi"
+#include "../npcx_gpio.dtsi"
+#include "../npcx_keyboard.dtsi"
+#include "../led_kingler.dtsi"
+#include "../npcx_motionsense.dtsi"
+#include "../npcx_usbc.dtsi"
+#include "../npcx_default_gpio_pinctrl.dtsi"
diff --git a/zephyr/program/corsola/prj_krabby.conf b/zephyr/program/corsola/krabby/project.conf
index c4cde05c16..c4cde05c16 100644
--- a/zephyr/program/corsola/prj_krabby.conf
+++ b/zephyr/program/corsola/krabby/project.conf
diff --git a/zephyr/program/corsola/krabby/project.overlay b/zephyr/program/corsola/krabby/project.overlay
new file mode 100644
index 0000000000..6aafaf4379
--- /dev/null
+++ b/zephyr/program/corsola/krabby/project.overlay
@@ -0,0 +1,19 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Corsola program common DTS includes */
+
+#include "../common.dtsi"
+#include "../power_signal.dtsi"
+#include "../usba.dtsi"
+#include "../ite_adc.dtsi"
+#include "../battery_krabby.dtsi"
+#include "../ite_gpio.dtsi"
+#include "../ite_keyboard.dtsi"
+#include "../i2c_krabby.dtsi"
+#include "../ite_interrupts.dtsi"
+#include "../led_krabby.dtsi"
+#include "../ite_motionsense.dtsi"
+#include "../ite_usbc.dtsi"
diff --git a/zephyr/program/corsola/led_kingler.dts b/zephyr/program/corsola/led_kingler.dtsi
index 92f6c4d4fe..92f6c4d4fe 100644
--- a/zephyr/program/corsola/led_kingler.dts
+++ b/zephyr/program/corsola/led_kingler.dtsi
diff --git a/zephyr/program/corsola/led_krabby.dts b/zephyr/program/corsola/led_krabby.dtsi
index b16bff3cac..b16bff3cac 100644
--- a/zephyr/program/corsola/led_krabby.dts
+++ b/zephyr/program/corsola/led_krabby.dtsi
diff --git a/zephyr/program/corsola/led_magikarp.dts b/zephyr/program/corsola/led_magikarp.dtsi
index 0e2b0aca52..0e2b0aca52 100644
--- a/zephyr/program/corsola/led_magikarp.dts
+++ b/zephyr/program/corsola/led_magikarp.dtsi
diff --git a/zephyr/program/corsola/led_steelix.dts b/zephyr/program/corsola/led_steelix.dtsi
index 6a25929327..6a25929327 100644
--- a/zephyr/program/corsola/led_steelix.dts
+++ b/zephyr/program/corsola/led_steelix.dtsi
diff --git a/zephyr/program/corsola/led_tentacruel.dts b/zephyr/program/corsola/led_tentacruel.dtsi
index 5569a956f6..5569a956f6 100644
--- a/zephyr/program/corsola/led_tentacruel.dts
+++ b/zephyr/program/corsola/led_tentacruel.dtsi
diff --git a/zephyr/program/corsola/prj_magikarp.conf b/zephyr/program/corsola/magikarp/project.conf
index a5ec9ede3b..a5ec9ede3b 100644
--- a/zephyr/program/corsola/prj_magikarp.conf
+++ b/zephyr/program/corsola/magikarp/project.conf
diff --git a/zephyr/program/corsola/magikarp/project.overlay b/zephyr/program/corsola/magikarp/project.overlay
new file mode 100644
index 0000000000..f4ca85e375
--- /dev/null
+++ b/zephyr/program/corsola/magikarp/project.overlay
@@ -0,0 +1,20 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Corsola program common DTS includes */
+
+#include "../common.dtsi"
+#include "../power_signal.dtsi"
+#include "../usba.dtsi"
+#include "../adc_magikarp.dtsi"
+#include "../battery_magikarp.dtsi"
+#include "../cbi_magikarp.dtsi"
+#include "../gpio_magikarp.dtsi"
+#include "../ite_keyboard.dtsi"
+#include "../i2c_magikarp.dtsi"
+#include "../interrupts_magikarp.dtsi"
+#include "../led_magikarp.dtsi"
+#include "../motionsense_magikarp.dtsi"
+#include "../usbc_magikarp.dtsi"
diff --git a/zephyr/program/corsola/motionsense_magikarp.dts b/zephyr/program/corsola/motionsense_magikarp.dtsi
index 92e73bd2c6..92e73bd2c6 100644
--- a/zephyr/program/corsola/motionsense_magikarp.dts
+++ b/zephyr/program/corsola/motionsense_magikarp.dtsi
diff --git a/zephyr/program/corsola/motionsense_steelix.dts b/zephyr/program/corsola/motionsense_steelix.dtsi
index df96fc2e42..df96fc2e42 100644
--- a/zephyr/program/corsola/motionsense_steelix.dts
+++ b/zephyr/program/corsola/motionsense_steelix.dtsi
diff --git a/zephyr/program/corsola/motionsense_tentacruel.dts b/zephyr/program/corsola/motionsense_tentacruel.dtsi
index 68b2c023df..68b2c023df 100644
--- a/zephyr/program/corsola/motionsense_tentacruel.dts
+++ b/zephyr/program/corsola/motionsense_tentacruel.dtsi
diff --git a/zephyr/program/corsola/adc_kingler.dts b/zephyr/program/corsola/npcx_adc.dtsi
index 7b69abe48a..7b69abe48a 100644
--- a/zephyr/program/corsola/adc_kingler.dts
+++ b/zephyr/program/corsola/npcx_adc.dtsi
diff --git a/zephyr/program/corsola/default_gpio_pinctrl_kingler.dts b/zephyr/program/corsola/npcx_default_gpio_pinctrl.dtsi
index 604658a145..604658a145 100644
--- a/zephyr/program/corsola/default_gpio_pinctrl_kingler.dts
+++ b/zephyr/program/corsola/npcx_default_gpio_pinctrl.dtsi
diff --git a/zephyr/program/corsola/gpio_kingler.dts b/zephyr/program/corsola/npcx_gpio.dtsi
index 9a827a06dd..9a827a06dd 100644
--- a/zephyr/program/corsola/gpio_kingler.dts
+++ b/zephyr/program/corsola/npcx_gpio.dtsi
diff --git a/zephyr/program/corsola/host_interface_npcx.dts b/zephyr/program/corsola/npcx_host_interface.dtsi
index 14efa3c6b2..14efa3c6b2 100644
--- a/zephyr/program/corsola/host_interface_npcx.dts
+++ b/zephyr/program/corsola/npcx_host_interface.dtsi
diff --git a/zephyr/program/corsola/i2c_kingler.dts b/zephyr/program/corsola/npcx_i2c.dtsi
index 90390ab8a0..90390ab8a0 100644
--- a/zephyr/program/corsola/i2c_kingler.dts
+++ b/zephyr/program/corsola/npcx_i2c.dtsi
diff --git a/zephyr/program/corsola/interrupts_kingler.dts b/zephyr/program/corsola/npcx_interrupts.dtsi
index f3da785a60..f3da785a60 100644
--- a/zephyr/program/corsola/interrupts_kingler.dts
+++ b/zephyr/program/corsola/npcx_interrupts.dtsi
diff --git a/zephyr/program/corsola/npcx_keyboard.dts b/zephyr/program/corsola/npcx_keyboard.dtsi
index f9e46de1f2..f9e46de1f2 100644
--- a/zephyr/program/corsola/npcx_keyboard.dts
+++ b/zephyr/program/corsola/npcx_keyboard.dtsi
diff --git a/zephyr/program/corsola/motionsense_kingler.dts b/zephyr/program/corsola/npcx_motionsense.dtsi
index a7f674e01f..a7f674e01f 100644
--- a/zephyr/program/corsola/motionsense_kingler.dts
+++ b/zephyr/program/corsola/npcx_motionsense.dtsi
diff --git a/zephyr/program/corsola/prj_npcx993_base.conf b/zephyr/program/corsola/npcx_program.conf
index e144e345ed..e144e345ed 100644
--- a/zephyr/program/corsola/prj_npcx993_base.conf
+++ b/zephyr/program/corsola/npcx_program.conf
diff --git a/zephyr/program/corsola/usbc_kingler.dts b/zephyr/program/corsola/npcx_usbc.dtsi
index 18bc6ce303..18bc6ce303 100644
--- a/zephyr/program/corsola/usbc_kingler.dts
+++ b/zephyr/program/corsola/npcx_usbc.dtsi
diff --git a/zephyr/program/corsola/power_signal.dts b/zephyr/program/corsola/power_signal.dtsi
index 5037bac228..5037bac228 100644
--- a/zephyr/program/corsola/power_signal.dts
+++ b/zephyr/program/corsola/power_signal.dtsi
diff --git a/zephyr/program/corsola/prj.conf b/zephyr/program/corsola/program.conf
index cb4ed7a3ef..cb4ed7a3ef 100644
--- a/zephyr/program/corsola/prj.conf
+++ b/zephyr/program/corsola/program.conf
diff --git a/zephyr/program/corsola/prj_steelix.conf b/zephyr/program/corsola/steelix/project.conf
index bf2de72512..bf2de72512 100644
--- a/zephyr/program/corsola/prj_steelix.conf
+++ b/zephyr/program/corsola/steelix/project.conf
diff --git a/zephyr/program/corsola/steelix/project.overlay b/zephyr/program/corsola/steelix/project.overlay
new file mode 100644
index 0000000000..3feea490be
--- /dev/null
+++ b/zephyr/program/corsola/steelix/project.overlay
@@ -0,0 +1,26 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Corsola program common DTS includes */
+
+#include "../common.dtsi"
+#include "../power_signal.dtsi"
+#include "../usba.dtsi"
+#include "../npcx_adc.dtsi"
+#include "../battery_steelix.dtsi"
+#include "../npcx_host_interface.dtsi"
+#include "../npcx_i2c.dtsi"
+#include "../npcx_interrupts.dtsi"
+#include "../interrupts_steelix.dtsi"
+#include "../cbi_steelix.dtsi"
+#include "../gpio_steelix.dtsi"
+#include "../npcx_keyboard.dtsi"
+#include "../keyboard_steelix.dtsi"
+#include "../led_steelix.dtsi"
+#include "../npcx_motionsense.dtsi"
+#include "../motionsense_steelix.dtsi"
+#include "../usba_steelix.dtsi"
+#include "../npcx_usbc.dtsi"
+#include "../npcx_default_gpio_pinctrl.dtsi"
diff --git a/zephyr/program/corsola/prj_tentacruel.conf b/zephyr/program/corsola/tentacruel/project.conf
index 71cc9d9694..71cc9d9694 100644
--- a/zephyr/program/corsola/prj_tentacruel.conf
+++ b/zephyr/program/corsola/tentacruel/project.conf
diff --git a/zephyr/program/corsola/tentacruel/project.overlay b/zephyr/program/corsola/tentacruel/project.overlay
new file mode 100644
index 0000000000..79bf2baa3d
--- /dev/null
+++ b/zephyr/program/corsola/tentacruel/project.overlay
@@ -0,0 +1,21 @@
+/* Copyright 2022 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Corsola program common DTS includes */
+
+#include "../common.dtsi"
+#include "../power_signal.dtsi"
+#include "../usba.dtsi"
+#include "../adc_tentacruel.dtsi"
+#include "../battery_tentacruel.dtsi"
+#include "../cbi_tentacruel.dtsi"
+#include "../gpio_tentacruel.dtsi"
+#include "../ite_keyboard.dtsi"
+#include "../i2c_tentacruel.dtsi"
+#include "../interrupts_tentacruel.dtsi"
+#include "../led_tentacruel.dtsi"
+#include "../motionsense_tentacruel.dtsi"
+#include "../usbc_tentacruel.dtsi"
+#include "../thermistor_tentacruel.dtsi"
diff --git a/zephyr/program/corsola/thermistor_tentacruel.dts b/zephyr/program/corsola/thermistor_tentacruel.dtsi
index f9e5306f24..f9e5306f24 100644
--- a/zephyr/program/corsola/thermistor_tentacruel.dts
+++ b/zephyr/program/corsola/thermistor_tentacruel.dtsi
diff --git a/zephyr/program/corsola/usba.dts b/zephyr/program/corsola/usba.dtsi
index 2ecb3b7d5a..2ecb3b7d5a 100644
--- a/zephyr/program/corsola/usba.dts
+++ b/zephyr/program/corsola/usba.dtsi
diff --git a/zephyr/program/corsola/usba_steelix.dts b/zephyr/program/corsola/usba_steelix.dtsi
index 0ddd67f664..0ddd67f664 100644
--- a/zephyr/program/corsola/usba_steelix.dts
+++ b/zephyr/program/corsola/usba_steelix.dtsi
diff --git a/zephyr/program/corsola/usbc_magikarp.dts b/zephyr/program/corsola/usbc_magikarp.dtsi
index c94db15b3a..c94db15b3a 100644
--- a/zephyr/program/corsola/usbc_magikarp.dts
+++ b/zephyr/program/corsola/usbc_magikarp.dtsi
diff --git a/zephyr/program/corsola/usbc_tentacruel.dts b/zephyr/program/corsola/usbc_tentacruel.dtsi
index bb105a8e08..bb105a8e08 100644
--- a/zephyr/program/corsola/usbc_tentacruel.dts
+++ b/zephyr/program/corsola/usbc_tentacruel.dtsi
diff --git a/zephyr/test/kingler/testcase.yaml b/zephyr/test/kingler/testcase.yaml
index 7e26480c14..2b1051a510 100644
--- a/zephyr/test/kingler/testcase.yaml
+++ b/zephyr/test/kingler/testcase.yaml
@@ -6,36 +6,36 @@ common:
   platform_allow: native_posix
 tests:
   kingler.steelix:
-    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/interrupts_kingler.dts;../program/corsola/cbi_steelix.dts;../program/corsola/gpio_steelix.dts"
+    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/cbi_steelix.dtsi;../program/corsola/gpio_steelix.dtsi"
     extra_configs:
       - CONFIG_TEST_STEELIX_RUSTY=y
       - CONFIG_TEST_FORM_FACTOR_CONVERTIBLE=y
   kingler.rusty:
-    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/interrupts_kingler.dts;../program/corsola/cbi_steelix.dts;../program/corsola/gpio_steelix.dts"
+    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/cbi_steelix.dtsi;../program/corsola/gpio_steelix.dtsi"
     extra_configs:
       - CONFIG_TEST_STEELIX_RUSTY=y
       - CONFIG_TEST_FORM_FACTOR_CLAMSHELL=y
   kingler.db_detect_typec:
-    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/interrupts_kingler.dts;../program/corsola/gpio_steelix.dts;"
+    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/gpio_steelix.dtsi;"
     extra_configs:
       - CONFIG_TEST_DB_DETECT_TYPEC=y
       - CONFIG_VARIANT_CORSOLA_DB_DETECTION=y
   kingler.db_detect_hdmi:
-    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/interrupts_kingler.dts;../program/corsola/gpio_steelix.dts"
+    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/gpio_steelix.dtsi"
     extra_configs:
       - CONFIG_TEST_DB_DETECT_HDMI=y
       - CONFIG_VARIANT_CORSOLA_DB_DETECTION=y
   kingler.db_detect_none:
-    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/interrupts_kingler.dts;../program/corsola/cbi_steelix.dts;../program/corsola/gpio_steelix.dts"
+    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/cbi_steelix.dtsi;../program/corsola/gpio_steelix.dtsi"
     extra_configs:
       - CONFIG_TEST_DB_DETECT_NONE=y
       - CONFIG_VARIANT_CORSOLA_DB_DETECTION=y
   kingler.ccd:
-    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/interrupts_kingler.dts;../program/corsola/cbi_steelix.dts;../program/corsola/gpio_steelix.dts"
+    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/cbi_steelix.dtsi;../program/corsola/gpio_steelix.dtsi"
     extra_configs:
       - CONFIG_TEST_KINGLER_CCD=y
   kingler.alt_sensor:
-    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/interrupts_kingler.dts;../program/corsola/interrupts_steelix.dts;../program/corsola/cbi_steelix.dts;../program/corsola/gpio_steelix.dts"
+    extra_args: DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/interrupts_steelix.dtsi;../program/corsola/cbi_steelix.dtsi;../program/corsola/gpio_steelix.dtsi"
     extra_configs:
       - CONFIG_TEST_STEELIX_RUSTY=y
       - CONFIG_TEST_ALT_SENSOR_PROBE=y
diff --git a/zephyr/test/krabby/testcase.yaml b/zephyr/test/krabby/testcase.yaml
index 5cc3c42428..6e202c92c8 100644
--- a/zephyr/test/krabby/testcase.yaml
+++ b/zephyr/test/krabby/testcase.yaml
@@ -6,12 +6,12 @@ common:
   platform_allow: native_posix
 tests:
   krabby.default:
-    extra_args: DTC_OVERLAY_FILE="common.dts;../program/corsola/interrupts_krabby.dts;../program/corsola/gpio_krabby.dts;pinctrl.dts"
+    extra_args: DTC_OVERLAY_FILE="common.dts;../program/corsola/ite_interrupts.dtsi;../program/corsola/ite_gpio.dtsi;pinctrl.dts"
     extra_configs:
       - CONFIG_TEST_KRABBY=y
       - CONFIG_MUX_INIT_ADC=y
   krabby.tentacruel:
-    extra_args: DTC_OVERLAY_FILE="common.dts;adc_temp.dts;../program/corsola/interrupts_tentacruel.dts;../program/corsola/gpio_tentacruel.dts;../program/corsola/thermistor_tentacruel.dts;pinctrl.dts"
+    extra_args: DTC_OVERLAY_FILE="common.dts;adc_temp.dts;../program/corsola/interrupts_tentacruel.dtsi;../program/corsola/gpio_tentacruel.dtsi;../program/corsola/thermistor_tentacruel.dtsi;pinctrl.dts"
     extra_configs:
       - CONFIG_TEST_TENTACRUEL=y
       - CONFIG_PLATFORM_EC_TEMP_SENSOR=y