tests: benchmarks: Enable power consumption tests on the legacy platforms

Run power consumtpion benchamrks on nrf52840 and nrf5340

Signed-off-by: Bartosz Miller <[email protected]>

Author: nordic-bami

tests/benchmarks/power_consumption/adc/Kconfig.sysbuild

@@ -1,10 +1,11 @@
 #
-# Copyright (c) 2024 Nordic Semiconductor ASA
+# Copyright (c) 2025 Nordic Semiconductor ASA
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
 source "share/sysbuild/Kconfig"
 
 config REMOTE_BOARD
-	string "The board used for remote target"
+	string
+	default "$(BOARD)/nrf54h20/cpurad" if SOC_NRF54H20_CPUAPP

tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay renamed to tests/benchmarks/power_consumption/adc/boards/nrf52840dk_nrf52840.overlay

@@ -1,10 +1,13 @@
 / {
 	aliases {
-		led = &button3;
+		led = &led0;
+		/delete-property/ led1;
 		adc0 = &adc;
 	};
 };
 
+/delete-node/ &led1;
+
 &adc {
 	#address-cells = <1>;
 	#size-cells = <0>;

tests/benchmarks/power_consumption/adc_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay renamed to tests/benchmarks/power_consumption/adc/boards/nrf5340dk_nrf5340_cpuapp.overlay

@@ -0,0 +1 @@
+CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y

tests/benchmarks/power_consumption/adc/boards/nrf54h20dk_nrf54h20_cpuapp.conf

@@ -39,7 +39,12 @@ void thread_definition(void)
 		return;
 	}
 	while (1) {
+#if defined(CONFIG_ADC_ASYNC)
+		ret = adc_read_async(adc, &sequence, NULL);
+#else
 		ret = adc_read(adc, &sequence);
+#endif
+
 		if (ret < 0) {
 			printk("Issue wih reading voltage, terminating thread.");
 			return;

tests/benchmarks/power_consumption/adc/src/driver_test.c

@@ -4,14 +4,10 @@
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
 
-if(NOT "${SB_CONFIG_REMOTE_BOARD}" STREQUAL "")
+if(SB_CONFIG_REMOTE_BOARD)
   ExternalZephyrProject_Add(
     APPLICATION remote_sleep_forever
     SOURCE_DIR ${APP_DIR}/../common/remote_sleep_forever
     BOARD ${SB_CONFIG_REMOTE_BOARD}
-    BOARD_REVISION ${BOARD_REVISION}
-  )
-
-  add_dependencies(adc remote_sleep_forever)
-  sysbuild_add_dependencies(FLASH adc remote_sleep_forever)
+    BOARD_REVISION ${BOARD_REVISION})
 endif()

tests/benchmarks/power_consumption/adc/sysbuild.cmake

@@ -1,33 +1,33 @@
 common:
+  integration_platforms:
+    - nrf52840dk/nrf52840
+    - nrf5340dk/nrf5340/cpuapp
+    - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54lm20dk/nrf54lm20a/cpuapp
+    - nrf54lv10dk/nrf54lv10a/cpuapp
+    - nrf54h20dk/nrf54h20/cpuapp
+  platform_allow:
+    - nrf52840dk/nrf52840
+    - nrf5340dk/nrf5340/cpuapp
+    - nrf54l15dk/nrf54l15/cpuapp
+    - nrf54lm20dk/nrf54lm20a/cpuapp
+    - nrf54lv10dk/nrf54lv10a/cpuapp
+    - nrf54h20dk/nrf54h20/cpuapp
   tags:
     - ppk_power_measure
     - ci_tests_benchmarks_current_consumption
 tests:
-  benchmarks.power_consumption.adc_nrf54l:
-    integration_platforms:
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54lm20dk/nrf54lm20a/cpuapp
-      - nrf54lv10dk/nrf54lv10a/cpuapp
-    platform_allow:
-      - nrf54l15dk/nrf54l15/cpuapp
-      - nrf54lm20dk/nrf54lm20a/cpuapp
-      - nrf54lv10dk/nrf54lv10a/cpuapp
+  benchmarks.power_consumption.adc:
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
       pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc_54L"
-  benchmarks.power_consumption.adc_nrf54h:
-    sysbuild: true
-    integration_platforms:
-      - nrf54h20dk/nrf54h20/cpuapp
-    platform_allow:
-      - nrf54h20dk/nrf54h20/cpuapp
-    extra_args:
-      - CONFIG_SOC_NRF54H20_CPURAD_ENABLE=y
-      - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc"
+  benchmarks.power_consumption.adc_async:
+    extra_configs:
+      - CONFIG_ADC_ASYNC=y
     harness: pytest
     harness_config:
       fixture: ppk_power_measure
       pytest_root:
-        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc_54H"
+        - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_thread_suspend_resume_adc"