[nrf fromtree] tests: comparator: nordic: Align boards overlays for changed input types

jaz1-nordic · bjarki-andreasen · commit 19370118ca93 · 2025-10-20T12:47:49.000+02:00
Align samples and tests boards overlays for changed comparator input types. Signed-off-by: Jakub Zymelka <jakub.zymelka@nordicsemi.no> (cherry picked from commit 6d7f429)
diff --git a/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_comparator.overlay b/samples/boards/nordic/system_off/boards/nrf54l15dk_nrf54l15_cpuapp_comparator.overlay
@@ -1,6 +1,8 @@
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN4";
+	psel = <NRF_COMP_AIN4>;
 	refsel = "VDD_4_8";
 	status = "okay";
 };
diff --git a/tests/boards/nrf/comp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/comp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay
@@ -5,6 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 / {
 	aliases {
 		test-comp = &comp;
@@ -30,9 +32,9 @@
 
 &comp {
 	status = "okay";
-	psel = "AIN4";
+	psel = <NRF_COMP_AIN4>;
 	refsel = "AREF";
-	extrefsel = "AIN3";
+	extrefsel = <NRF_COMP_AIN3>;
 	sp-mode = "NORMAL";
 	th-up = <36>;
 	th-down = <30>;
diff --git a/tests/boards/nrf/comp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/comp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay
@@ -5,6 +5,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 / {
 	aliases {
 		test-comp = &comp;
@@ -30,9 +32,9 @@
 
 &comp {
 	status = "okay";
-	psel = "AIN4";
+	psel = <NRF_COMP_AIN4>;
 	refsel = "AREF";
-	extrefsel = "AIN3";
+	extrefsel = <NRF_COMP_AIN3>;
 	sp-mode = "NORMAL";
 	th-up = <36>;
 	th-down = <30>;
diff --git a/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 / {
 	aliases {
 		test-comp = &comp;
@@ -25,9 +27,9 @@
 
 &comp {
 	status = "okay";
-	psel = "AIN5";
+	psel = <NRF_COMP_AIN5>;
 	refsel = "AREF";
-	extrefsel = "AIN1";
+	extrefsel = <NRF_COMP_AIN1>;
 	sp-mode = "HIGH";
 	th-up = <36>;
 	th-down = <30>;
diff --git a/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 / {
 	aliases {
 		test-comp = &comp;
@@ -29,9 +31,9 @@
 
 &comp {
 	status = "okay";
-	psel = "AIN4";
+	psel = <NRF_COMP_AIN4>;
 	refsel = "AREF";
-	extrefsel = "AIN3";
+	extrefsel = <NRF_COMP_AIN3>;
 	sp-mode = "NORMAL";
 	th-up = <36>;
 	th-down = <30>;
diff --git a/tests/boards/nrf/comp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/boards/nrf/comp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
@@ -5,6 +5,8 @@
  * AIN4 (P1.06) tied to VDD
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 / {
 	aliases {
 		test-comp = &comp;
@@ -22,9 +24,9 @@
 
 &comp {
 	status = "okay";
-	psel = "AIN4";
+	psel = <NRF_COMP_AIN4>;
 	refsel = "AREF";
-	extrefsel = "AIN3";
+	extrefsel = <NRF_COMP_AIN3>;
 	sp-mode = "NORMAL";
 	th-up = <36>;
 	th-down = <30>;
diff --git a/tests/boards/nrf/comp/src/test.c b/tests/boards/nrf/comp/src/test.c
@@ -5,6 +5,7 @@
  */
 
 #include <zephyr/ztest.h>
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
 #include <zephyr/drivers/comparator/nrf_comp.h>
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/kernel.h>
@@ -13,14 +14,11 @@ static const struct device *test_dev = DEVICE_DT_GET(DT_ALIAS(test_comp));
 static const struct gpio_dt_spec test_pin_1 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), first_gpios);
 static const struct gpio_dt_spec test_pin_2 = GPIO_DT_SPEC_GET(DT_PATH(zephyr_user), second_gpios);
 
-#define TEST_COMP_SE_PSEL_AIN _CONCAT(COMP_NRF_COMP_PSEL_AIN, \
-				      CONFIG_TEST_COMP_SE_PSEL_AIN_INDEX)
-#define TEST_COMP_SE_EXTREFSEL_AIN _CONCAT(COMP_NRF_COMP_EXTREFSEL_AIN, \
-					   CONFIG_TEST_COMP_SE_EXTREFSEL_AIN_INDEX)
-#define TEST_COMP_DIFF_PSEL_AIN _CONCAT(COMP_NRF_COMP_PSEL_AIN, \
-					CONFIG_TEST_COMP_DIFF_PSEL_AIN_INDEX)
-#define TEST_COMP_DIFF_EXTREFSEL_AIN _CONCAT(COMP_NRF_COMP_EXTREFSEL_AIN, \
-					     CONFIG_TEST_COMP_DIFF_EXTREFSEL_AIN_INDEX)
+#define TEST_COMP_SE_PSEL_AIN      _CONCAT(NRF_COMP_AIN, CONFIG_TEST_COMP_SE_PSEL_AIN_INDEX)
+#define TEST_COMP_SE_EXTREFSEL_AIN _CONCAT(NRF_COMP_AIN, CONFIG_TEST_COMP_SE_EXTREFSEL_AIN_INDEX)
+#define TEST_COMP_DIFF_PSEL_AIN    _CONCAT(NRF_COMP_AIN, CONFIG_TEST_COMP_DIFF_PSEL_AIN_INDEX)
+#define TEST_COMP_DIFF_EXTREFSEL_AIN                                                               \
+	_CONCAT(NRF_COMP_AIN, CONFIG_TEST_COMP_DIFF_EXTREFSEL_AIN_INDEX)
 
 struct comp_nrf_comp_se_config comp_se_config = {
 	.psel = TEST_COMP_SE_PSEL_AIN,
diff --git a/tests/drivers/build_all/comparator/nrf_comp/diff.overlay b/tests/drivers/build_all/comparator/nrf_comp/diff.overlay
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "DIFF";
-	psel = "AIN0";
-	extrefsel = "AIN1";
+	psel = <NRF_COMP_AIN0>;
+	extrefsel = <NRF_COMP_AIN1>;
 	sp-mode = "HIGH";
 	isource = "DISABLED";
 	status = "okay";
diff --git a/tests/drivers/build_all/comparator/nrf_comp/se.overlay b/tests/drivers/build_all/comparator/nrf_comp/se.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN0";
+	psel = <NRF_COMP_AIN0>;
 	refsel = "INT_1V2";
 	sp-mode = "HIGH";
 	th-up = <36>;
diff --git a/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay b/tests/drivers/build_all/comparator/nrf_comp/se_aref.overlay
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN0";
-	extrefsel = "AIN1";
+	psel = <NRF_COMP_AIN0>;
+	extrefsel = <NRF_COMP_AIN1>;
 	refsel = "AREF";
 	sp-mode = "HIGH";
 	th-up = <36>;
diff --git a/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay b/tests/drivers/build_all/comparator/nrf_lpcomp/ext_ref.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN0";
+	psel = <NRF_COMP_AIN0>;
 	refsel = "VDD_4_8";
 	status = "okay";
 };
diff --git a/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay b/tests/drivers/build_all/comparator/nrf_lpcomp/int_ref.overlay
@@ -4,10 +4,12 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN0";
+	psel = <NRF_COMP_AIN0>;
 	refsel = "AREF";
-	extrefsel = "AIN1";
+	extrefsel = <NRF_COMP_AIN1>;
 	status = "okay";
 };
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay
@@ -5,9 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN4"; /* P1.11 */
+	psel = <NRF_COMP_AIN4>; /* P1.11 */
 	refsel = "INT_1V2";
 	sp-mode = "HIGH";
 	th-up = <63>;
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay
@@ -5,9 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN4"; /* P1.11 */
+	psel = <NRF_COMP_AIN4>; /* P1.11 */
 	refsel = "INT_1V2";
 	sp-mode = "HIGH";
 	th-up = <63>;
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN0"; /* P0.04 */
+	psel = <NRF_COMP_AIN0>; /* P0.04 */
 	refsel = "VDD";
 	sp-mode = "HIGH";
 	th-up = <34>;
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN2"; /* P1.02 */
+	psel = <NRF_COMP_AIN2>; /* P1.02 */
 	refsel = "INT_1V2";
 	sp-mode = "HIGH";
 	th-up = <63>;
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN4"; /* P1.11 */
+	psel = <NRF_COMP_AIN4>; /* P1.11 */
 	refsel = "INT_1V2";
 	sp-mode = "HIGH";
 	th-up = <63>;
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_comp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	main-mode = "SE";
-	psel = "AIN1"; /* P1.31 */
+	psel = <NRF_COMP_AIN1>; /* P1.31 */
 	refsel = "INT_1V2";
 	sp-mode = "HIGH";
 	th-up = <63>;
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15_dvk_nrf54l15_cpuapp.overlay
@@ -5,9 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN4"; /* P1.11 */
+	psel = <NRF_COMP_AIN4>; /* P1.11 */
 	refsel = "VDD_4_8";
 	status = "okay";
 };
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/bl54l15u_dvk_nrf54l15_cpuapp.overlay
@@ -5,9 +5,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN4"; /* P1.11 */
+	psel = <NRF_COMP_AIN4>; /* P1.11 */
 	refsel = "VDD_4_8";
 	status = "okay";
 };
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf5340dk_nrf5340_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN0"; /* P0.04 */
+	psel = <NRF_COMP_AIN0>; /* P0.04 */
 	refsel = "VDD_4_8";
 	status = "okay";
 };
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN2"; /* P1.02 */
+	psel = <NRF_COMP_AIN2>; /* P1.02 */
 	refsel = "VDD_4_8";
 	status = "okay";
 };
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN4"; /* P1.11 */
+	psel = <NRF_COMP_AIN4>; /* P1.11 */
 	refsel = "VDD_4_8";
 	status = "okay";
 };
diff --git a/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay b/tests/drivers/comparator/gpio_loopback/snippets/nrf_lpcomp/boards/nrf54lm20dk_nrf54lm20a_cpuapp.overlay
@@ -4,9 +4,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#include <zephyr/dt-bindings/comparator/nrf-comp.h>
+
 &comp {
 	compatible = "nordic,nrf-lpcomp";
-	psel = "AIN1"; /* P1.31 */
+	psel = <NRF_COMP_AIN1>; /* P1.31 */
 	refsel = "VDD_4_8";
 	status = "okay";
 };
