kingler: test: use overlay to maintain dts files

To follow the new project layout, and also to reduce the
duplicate codes.

This CL also adds some configs to prevent a build break.

BUG=none
TEST=./twister -c -i -T zephyr/test/kingler
BRANCH=none

Change-Id: Ic7f5024c6425a70b9587435965932f2bc272b94f
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4322780
Auto-Submit: Eric Yilun Lin <yllin@google.com>
Tested-by: Eric Yilun Lin <yllin@google.com>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>

5 files changed, 40 insertions, 7 deletions

diff --git a/zephyr/test/kingler/common.dts b/zephyr/test/kingler/common.dtsi
index c04844f227..c04844f227 100644
--- a/zephyr/test/kingler/common.dts
+++ b/zephyr/test/kingler/common.dtsi
diff --git a/zephyr/test/kingler/kingler.default.overlay b/zephyr/test/kingler/kingler.default.overlay
new file mode 100644
index 0000000000..908022f5e2
--- /dev/null
+++ b/zephyr/test/kingler/kingler.default.overlay
@@ -0,0 +1,8 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "common.dtsi"
+#include "../program/corsola/npcx_interrupts.dtsi"
+#include "../program/corsola/npcx_gpio.dtsi"
diff --git a/zephyr/test/kingler/kingler.steelix.overlay b/zephyr/test/kingler/kingler.steelix.overlay
new file mode 100644
index 0000000000..f033ae92b7
--- /dev/null
+++ b/zephyr/test/kingler/kingler.steelix.overlay
@@ -0,0 +1,21 @@
+/* Copyright 2023 The ChromiumOS Authors
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#include "common.dtsi"
+#include "../program/corsola/npcx_interrupts.dtsi"
+#include "../program/corsola/npcx_gpio.dtsi"
+#include "../program/corsola/steelix/cbi.dtsi"
+#include "../program/corsola/steelix/interrupts.dtsi"
+
+/ {
+	aliases {
+		/*
+		 * motion sense's <>_INT_EVENT is handled
+		 * by alias. Using the alias, each driver creates
+		 * its own <>_INT_EVENT.
+		 */
+		lsm6dsm-int = &base_accel;
+	};
+};
diff --git a/zephyr/test/kingler/src/fakes.c b/zephyr/test/kingler/src/fakes.c
index f5a3c30b0b..52befc59c4 100644
--- a/zephyr/test/kingler/src/fakes.c
+++ b/zephyr/test/kingler/src/fakes.c
@@ -26,6 +26,8 @@ FAKE_VOID_FUNC(ccd_interrupt, enum gpio_signal);
 #ifdef CONFIG_TEST_STEELIX_RUSTY
 FAKE_VOID_FUNC(x_ec_interrupt, enum gpio_signal);
 FAKE_VOID_FUNC(motion_sensors_check_ssfc);
+#else
+FAKE_VOID_FUNC(motion_interrupt, enum gpio_signal);
 #endif
 
 #ifdef CONFIG_VARIANT_CORSOLA_DB_DETECTION
diff --git a/zephyr/test/kingler/testcase.yaml b/zephyr/test/kingler/testcase.yaml
index fb88e024c5..540664af7d 100644
--- a/zephyr/test/kingler/testcase.yaml
+++ b/zephyr/test/kingler/testcase.yaml
@@ -7,42 +7,44 @@ common:
 tests:
   kingler.steelix:
     extra_args:
-      DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/steelix/cbi.dtsi;../program/corsola/npcx_gpio.dtsi"
+      DTC_OVERLAY_FILE="kingler.steelix.overlay"
     extra_configs:
       - CONFIG_TEST_STEELIX_RUSTY=y
       - CONFIG_TEST_FORM_FACTOR_CONVERTIBLE=y
+      - CONFIG_PLATFORM_EC_ACCELGYRO_LSM6DSM=y
   kingler.rusty:
     extra_args:
-      DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/steelix/cbi.dtsi;../program/corsola/npcx_gpio.dtsi"
+      DTC_OVERLAY_FILE="kingler.steelix.overlay"
     extra_configs:
       - CONFIG_TEST_STEELIX_RUSTY=y
       - CONFIG_TEST_FORM_FACTOR_CLAMSHELL=y
+      - CONFIG_PLATFORM_EC_ACCELGYRO_LSM6DSM=y
   kingler.db_detect_typec:
     extra_args:
-      DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/npcx_gpio.dtsi;"
+      DTC_OVERLAY_FILE="kingler.default.overlay"
     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/npcx_interrupts.dtsi;../program/corsola/npcx_gpio.dtsi"
+      DTC_OVERLAY_FILE="kingler.default.overlay"
     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/npcx_interrupts.dtsi;../program/corsola/steelix/cbi.dtsi;../program/corsola/npcx_gpio.dtsi"
+      DTC_OVERLAY_FILE="kingler.steelix.overlay"
     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/npcx_interrupts.dtsi;../program/corsola/steelix/cbi.dtsi;../program/corsola/npcx_gpio.dtsi"
+      DTC_OVERLAY_FILE="kingler.default.overlay"
     extra_configs:
       - CONFIG_TEST_KINGLER_CCD=y
   kingler.alt_sensor:
     extra_args:
-      DTC_OVERLAY_FILE="./common.dts;../program/corsola/npcx_interrupts.dtsi;../program/corsola/steelix/interrupts.dtsi;../program/corsola/steelix/cbi.dtsi;../program/corsola/npcx_gpio.dtsi"
+      DTC_OVERLAY_FILE="kingler.steelix.overlay"
     extra_configs:
       - CONFIG_TEST_STEELIX_RUSTY=y
       - CONFIG_TEST_ALT_SENSOR_PROBE=y