diff --git a/tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..6333ddf14506 --- /dev/null +++ b/tests/benchmarks/current_consumption/nfc_idle/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,7 @@ +/ { + aliases { + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; diff --git a/tests/benchmarks/current_consumption/nfc_idle/sysbuild.cmake b/tests/benchmarks/current_consumption/nfc_idle/sysbuild.cmake index a073424f314f..575c09351a20 100644 --- a/tests/benchmarks/current_consumption/nfc_idle/sysbuild.cmake +++ b/tests/benchmarks/current_consumption/nfc_idle/sysbuild.cmake @@ -8,7 +8,7 @@ if(SB_CONFIG_SOC_NRF54H20) # Add remote project ExternalZephyrProject_Add( APPLICATION remote - SOURCE_DIR ${SYSBUILD_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever + SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever BOARD ${SB_CONFIG_REMOTE_BOARD} BOARD_REVISION ${BOARD_REVISION} ) diff --git a/tests/benchmarks/multicore/idle_hpu_temp_meas/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_hpu_temp_meas/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..21da4cf3d3b8 --- /dev/null +++ b/tests/benchmarks/multicore/idle_hpu_temp_meas/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include + +/ { + + aliases { + led = &led0; + /delete-property/ led1; + }; + +}; + +/delete-node/ &led1; diff --git a/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf b/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf index 1c65777685dc..a23f66a85c2c 100644 --- a/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf +++ b/tests/benchmarks/multicore/idle_hpu_temp_meas/prj.conf @@ -5,7 +5,6 @@ CONFIG_PM_DEVICE=y CONFIG_PM_DEVICE_RUNTIME=y CONFIG_POWEROFF=y -CONFIG_GPIO=n CONFIG_BOOT_BANNER=n CONFIG_ASSERT=y diff --git a/tests/benchmarks/multicore/idle_hpu_temp_meas/sysbuild.cmake b/tests/benchmarks/multicore/idle_hpu_temp_meas/sysbuild.cmake index bf4d824b4b65..c6b6fe2e0d43 100644 --- a/tests/benchmarks/multicore/idle_hpu_temp_meas/sysbuild.cmake +++ b/tests/benchmarks/multicore/idle_hpu_temp_meas/sysbuild.cmake @@ -11,7 +11,7 @@ endif() # Add remote project ExternalZephyrProject_Add( APPLICATION remote - SOURCE_DIR ${SYSBUILD_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever + SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever BOARD ${SB_CONFIG_REMOTE_BOARD} BOARD_REVISION ${BOARD_REVISION} ) diff --git a/tests/benchmarks/multicore/idle_outside_of_main/remote/src/main.c b/tests/benchmarks/multicore/idle_outside_of_main/boards/nrf54h20dk_nrf54h20_cpuapp.overlay similarity index 57% rename from tests/benchmarks/multicore/idle_outside_of_main/remote/src/main.c rename to tests/benchmarks/multicore/idle_outside_of_main/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 744bcbb53cfe..43f62aaf213b 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/remote/src/main.c +++ b/tests/benchmarks/multicore/idle_outside_of_main/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,12 +4,11 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ -#include - -int main(void) -{ - - k_msleep(2000); - - return 0; -} +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; diff --git a/tests/benchmarks/multicore/idle_outside_of_main/prj.conf b/tests/benchmarks/multicore/idle_outside_of_main/prj.conf index d9e7894c6bf0..faa8eb88a186 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/prj.conf +++ b/tests/benchmarks/multicore/idle_outside_of_main/prj.conf @@ -12,4 +12,3 @@ CONFIG_PRINTK=n CONFIG_LOG=n CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n -CONFIG_GPIO=n diff --git a/tests/benchmarks/multicore/idle_outside_of_main/remote/CMakeLists.txt b/tests/benchmarks/multicore/idle_outside_of_main/remote/CMakeLists.txt index 97caab4871c3..3f79e49afb26 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/remote/CMakeLists.txt +++ b/tests/benchmarks/multicore/idle_outside_of_main/remote/CMakeLists.txt @@ -9,4 +9,4 @@ cmake_minimum_required(VERSION 3.20.0) find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(remote) -target_sources(app PRIVATE src/main.c) +target_sources(app PRIVATE ../src/main.c) diff --git a/tests/benchmarks/multicore/idle_outside_of_main/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/benchmarks/multicore/idle_outside_of_main/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay new file mode 100644 index 000000000000..6749492247e5 --- /dev/null +++ b/tests/benchmarks/multicore/idle_outside_of_main/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +/ { + aliases { + led = &led1; + }; + + leds { + compatible = "gpio-leds"; + led1: led_1 { + gpios = <&gpio9 1 GPIO_ACTIVE_HIGH>; + label = "Green LED 1"; + }; + }; +}; + +&gpio9 { + status = "okay"; +}; + +&gpiote130 { + status = "okay"; +}; diff --git a/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf b/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf index 153d14f104ad..2a78231f8fb7 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_outside_of_main/remote/prj.conf @@ -3,6 +3,6 @@ CONFIG_POWEROFF=y CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n -CONFIG_GPIO=n +CONFIG_GPIO=y CONFIG_NCS_BOOT_BANNER=n CONFIG_BOOT_BANNER=n diff --git a/tests/benchmarks/multicore/idle_outside_of_main/src/main.c b/tests/benchmarks/multicore/idle_outside_of_main/src/main.c index 744bcbb53cfe..3295d3eacb9b 100644 --- a/tests/benchmarks/multicore/idle_outside_of_main/src/main.c +++ b/tests/benchmarks/multicore/idle_outside_of_main/src/main.c @@ -5,11 +5,24 @@ */ #include +#include +#include +#include + +LOG_MODULE_REGISTER(idle_outside_of_main); + +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); + int main(void) { + int ret; + + ret = gpio_is_ready_dt(&led); + __ASSERT(ret, "Error: GPIO Device not ready"); - k_msleep(2000); + ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE); + __ASSERT(ret == 0, "Could not configure led GPIO"); return 0; } diff --git a/tests/benchmarks/multicore/idle_pwm_led/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_pwm_led/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..8d95424daee6 --- /dev/null +++ b/tests/benchmarks/multicore/idle_pwm_led/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,16 @@ +/* + * Copyright (c) 2024 Nordic Semiconductor ASA + * + * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause + */ + +#include + +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; diff --git a/tests/benchmarks/multicore/idle_pwm_led/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_0.overlay b/tests/benchmarks/multicore/idle_pwm_led/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_0.overlay index cd26bcf83d33..0529e43ab6c4 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_0.overlay +++ b/tests/benchmarks/multicore/idle_pwm_led/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_0.overlay @@ -8,6 +8,8 @@ / { aliases { + led = &led0; + /delete-property/ led1; pwm-led0 = &pwm120_gpio; }; @@ -19,6 +21,8 @@ }; }; +/delete-node/ &led1; + &pinctrl { /omit-if-no-ref/ pwm120_default: pwm120_default { group1 { diff --git a/tests/benchmarks/multicore/idle_pwm_led/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/benchmarks/multicore/idle_pwm_led/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 5fcd71d3a39c..1dd90464ecda 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/tests/benchmarks/multicore/idle_pwm_led/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -6,9 +6,18 @@ / { aliases { + led = &led1; pwm-led0 = &pwm_gpio; }; + leds { + compatible = "gpio-leds"; + led1: led_1 { + gpios = <&gpio9 1 GPIO_ACTIVE_HIGH>; + label = "Green LED 1"; + }; + }; + pwmleds { compatible = "pwm-leds"; pwm_gpio: pwm_gpio { @@ -32,6 +41,14 @@ }; }; +&gpio9 { + status = "okay"; +}; + +&gpiote130 { + status = "okay"; +}; + &pwm131 { status = "okay"; pinctrl-0 = <&pwm131_default>; diff --git a/tests/benchmarks/multicore/idle_pwm_led/remote/prj.conf b/tests/benchmarks/multicore/idle_pwm_led/remote/prj.conf index bbe2b1d251b5..936da443e4a7 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_pwm_led/remote/prj.conf @@ -1,3 +1,4 @@ CONFIG_PRINTK=y CONFIG_LOG=y CONFIG_PWM=y +CONFIG_GPIO=y diff --git a/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf index 0563d3ce33d5..4d5a9c6f26f1 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_pwm_led/remote/prj_s2ram.conf @@ -7,3 +7,4 @@ CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n CONFIG_PWM=y +CONFIG_GPIO=y diff --git a/tests/benchmarks/multicore/idle_pwm_led/src/main.c b/tests/benchmarks/multicore/idle_pwm_led/src/main.c index 3c4d72acebe1..9066c1b20cdd 100644 --- a/tests/benchmarks/multicore/idle_pwm_led/src/main.c +++ b/tests/benchmarks/multicore/idle_pwm_led/src/main.c @@ -9,18 +9,13 @@ LOG_MODULE_REGISTER(idle_pwm_led, LOG_LEVEL_INF); #include #include +#include #include -#if IS_ENABLED(CONFIG_SOC_NRF54H20_CPUAPP_COMMON) -/* Alias pwm-led0 = &pwm_led2 */ +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); static const struct pwm_dt_spec pwm_led = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led0)); -#elif IS_ENABLED(CONFIG_SOC_NRF54H20_CPURAD_COMMON) -/* Alias pwm-led0 = &pwm_led3 */ -static const struct pwm_dt_spec pwm_led = PWM_DT_SPEC_GET(DT_ALIAS(pwm_led0)); -#else -#error "Invalid core selected." -#endif + #define PWM_STEPS_PER_SEC (50) @@ -35,6 +30,16 @@ int main(void) int32_t pulse_step; uint32_t current_pulse_width; + if (!gpio_is_ready_dt(&led)) { + LOG_ERR("GPIO Device not ready"); + return 0; + } + + if (gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE) != 0) { + LOG_ERR("Could not configure led GPIO"); + return 0; + } + if (!pwm_is_ready_dt(&pwm_led)) { LOG_ERR("Device %s is not ready.", pwm_led.dev->name); return -ENODEV; @@ -110,7 +115,9 @@ int main(void) #endif /* Sleep / enter low power state */ + gpio_pin_set_dt(&led, 0); k_msleep(CONFIG_TEST_SLEEP_DURATION_MS); + gpio_pin_set_dt(&led, 1); } return 0; diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 51506a10816a..6d0db37ace0c 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -13,6 +13,12 @@ */ / { + + aliases { + led = &led0; + /delete-property/ led1; + }; + pwm_to_gpio_loopback: pwm_to_gpio_loopback { compatible = "test-pwm-to-gpio-loopback"; pwms = <&pwm130 0 PWM_USEC(200) PWM_POLARITY_NORMAL>; @@ -20,6 +26,8 @@ }; }; +/delete-node/ &led1; + &pinctrl { /omit-if-no-ref/ pwm130_default: pwm130_default { group1 { diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay b/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay index 07e2f6e47486..39938da50dd4 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay +++ b/tests/benchmarks/multicore/idle_pwm_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast_p7_1.overlay @@ -13,6 +13,11 @@ */ / { + aliases { + led = &led0; + /delete-property/ led1; + }; + pwm_to_gpio_loopback: pwm_to_gpio_loopback { compatible = "test-pwm-to-gpio-loopback"; pwms = <&pwm120 1 PWM_USEC(200) PWM_POLARITY_NORMAL>; @@ -20,6 +25,8 @@ }; }; +/delete-node/ &led1; + &pinctrl { /omit-if-no-ref/ pwm120_default: pwm120_default { group1 { diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/benchmarks/multicore/idle_pwm_loopback/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay index f10e4f79f1f7..46faa45926c6 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/tests/benchmarks/multicore/idle_pwm_loopback/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -13,6 +13,18 @@ */ / { + aliases { + led = &led1; + }; + + leds { + compatible = "gpio-leds"; + led1: led_1 { + gpios = <&gpio9 1 GPIO_ACTIVE_HIGH>; + label = "Green LED 1"; + }; + }; + pwm_to_gpio_loopback: pwm_to_gpio_loopback { compatible = "test-pwm-to-gpio-loopback"; pwms = <&pwm131 0 PWM_USEC(200) PWM_POLARITY_NORMAL>; @@ -20,6 +32,10 @@ }; }; +&gpio9 { + status = "okay"; +}; + &pinctrl { /omit-if-no-ref/ pwm131_default: pwm131_default { group1 { diff --git a/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c b/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c index 9f330a66cf71..4ca59fea2a1c 100644 --- a/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c +++ b/tests/benchmarks/multicore/idle_pwm_loopback/src/main.c @@ -21,6 +21,8 @@ LOG_MODULE_REGISTER(idle_pwm_loop, LOG_LEVEL_INF); #error "Unsupported board: pwm_to_gpio_loopback node is not defined" #endif +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); + static const struct gpio_dt_spec pin_in = GPIO_DT_SPEC_GET_BY_IDX( DT_NODELABEL(pwm_to_gpio_loopback), gpios, 0); @@ -97,9 +99,18 @@ int main(void) uint32_t tolerance; int ret; + ret = gpio_is_ready_dt(&led); + __ASSERT(ret, "Error: GPIO Device not ready"); + #if defined(CONFIG_CLOCK_CONTROL) + ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_INACTIVE); + __ASSERT(ret == 0, "Could not configure led GPIO"); k_msleep(1000); + gpio_pin_set_dt(&led, 1); set_global_domain_frequency(); +#else + ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE); + __ASSERT(ret == 0, "Could not configure led GPIO"); #endif /* Set PWM fill ratio to 50% */ @@ -226,7 +237,9 @@ int main(void) __ASSERT_NO_MSG(low >= edges - tolerance); /* Sleep / enter low power state */ + gpio_pin_set_dt(&led, 0); k_msleep(CONFIG_TEST_SLEEP_DURATION_MS); + gpio_pin_set_dt(&led, 1); } return 0; diff --git a/tests/benchmarks/multicore/idle_spim/Kconfig.sysbuild b/tests/benchmarks/multicore/idle_spim/Kconfig.sysbuild deleted file mode 100644 index 0898eb292938..000000000000 --- a/tests/benchmarks/multicore/idle_spim/Kconfig.sysbuild +++ /dev/null @@ -1,10 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -source "${ZEPHYR_BASE}/share/sysbuild/Kconfig" - -config REMOTE_BOARD - string "The board used for remote target" diff --git a/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 7a7a22205496..cf8f0cc76ac3 100644 --- a/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_spim/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,6 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + &spi131 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/multicore/idle_spim/remote/CMakeLists.txt b/tests/benchmarks/multicore/idle_spim/remote/CMakeLists.txt deleted file mode 100644 index 97caab4871c3..000000000000 --- a/tests/benchmarks/multicore/idle_spim/remote/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -# -# Copyright (c) 2024 Nordic Semiconductor ASA -# -# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause -# - -cmake_minimum_required(VERSION 3.20.0) - -find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) -project(remote) - -target_sources(app PRIVATE src/main.c) diff --git a/tests/benchmarks/multicore/idle_spim/remote/prj.conf b/tests/benchmarks/multicore/idle_spim/remote/prj.conf deleted file mode 100644 index 136c013a406a..000000000000 --- a/tests/benchmarks/multicore/idle_spim/remote/prj.conf +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG_PM=y -CONFIG_POWEROFF=y -CONFIG_CONSOLE=n -CONFIG_UART_CONSOLE=n -CONFIG_SERIAL=n -CONFIG_GPIO=n -CONFIG_BOOT_BANNER=n diff --git a/tests/benchmarks/multicore/idle_spim/remote/src/main.c b/tests/benchmarks/multicore/idle_spim/remote/src/main.c deleted file mode 100644 index 61b5b084a585..000000000000 --- a/tests/benchmarks/multicore/idle_spim/remote/src/main.c +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (c) 2024 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -#include - -int main(void) -{ - k_sleep(K_FOREVER); - - return 0; -} diff --git a/tests/benchmarks/multicore/idle_spim/src/main.c b/tests/benchmarks/multicore/idle_spim/src/main.c index 7e388d74dec8..cbd1b910e4a0 100644 --- a/tests/benchmarks/multicore/idle_spim/src/main.c +++ b/tests/benchmarks/multicore/idle_spim/src/main.c @@ -7,6 +7,9 @@ #include #include #include +#include + +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); LOG_MODULE_REGISTER(idle_spim); @@ -42,6 +45,12 @@ int main(void) bool status; uint8_t response; + status = gpio_is_ready_dt(&led); + __ASSERT(status, "Error: GPIO Device not ready"); + + status = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE); + __ASSERT(status == 0, "Could not configure led GPIO"); + status = spi_is_ready_dt(&spim_spec); __ASSERT(status, "Error: SPI device is not ready"); @@ -50,7 +59,9 @@ int main(void) spi_read_register(CHIP_ID_REGISTER_ADDRESS, &response); printk("Chip ID: 0x%x\n", response); } + gpio_pin_set_dt(&led, 0); k_msleep(2000); + gpio_pin_set_dt(&led, 1); } return 0; diff --git a/tests/benchmarks/multicore/idle_spim/sysbuild.cmake b/tests/benchmarks/multicore/idle_spim/sysbuild.cmake index 95f72f9435dd..bf4119b6a338 100644 --- a/tests/benchmarks/multicore/idle_spim/sysbuild.cmake +++ b/tests/benchmarks/multicore/idle_spim/sysbuild.cmake @@ -1,22 +1,15 @@ # -# Copyright (c) 2023 Nordic Semiconductor ASA +# Copyright (c) 2024 Nordic Semiconductor ASA # # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -if("${SB_CONFIG_REMOTE_BOARD}" STREQUAL "") - message(FATAL_ERROR "REMOTE_BOARD must be set to a valid board name") -endif() - -# Add remote project -ExternalZephyrProject_Add( +if(SB_CONFIG_SOC_NRF54H20) + # Add remote project + ExternalZephyrProject_Add( APPLICATION remote - SOURCE_DIR ${APP_DIR}/remote - BOARD ${SB_CONFIG_REMOTE_BOARD} + SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever + BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad BOARD_REVISION ${BOARD_REVISION} ) - -# Add a dependency so that the remote image will be built and flashed first -add_dependencies(idle_spim remote) -# Add dependency so that the remote image is flashed first. -sysbuild_add_dependencies(FLASH idle_spim remote) +endif() diff --git a/tests/benchmarks/multicore/idle_spim/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf b/tests/benchmarks/multicore/idle_spim/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf deleted file mode 100644 index dd863e78d993..000000000000 --- a/tests/benchmarks/multicore/idle_spim/sysbuild/nrf54h20dk_nrf54h20_cpurad.conf +++ /dev/null @@ -1 +0,0 @@ -SB_CONFIG_REMOTE_BOARD="nrf54h20dk/nrf54h20/cpurad" diff --git a/tests/benchmarks/multicore/idle_spim/testcase.yaml b/tests/benchmarks/multicore/idle_spim/testcase.yaml index 8e2c4f66a01e..63efc8620027 100644 --- a/tests/benchmarks/multicore/idle_spim/testcase.yaml +++ b/tests/benchmarks/multicore/idle_spim/testcase.yaml @@ -12,7 +12,6 @@ tests: - nrf54h20dk/nrf54h20/cpuapp extra_args: - SHIELD=pca63566 - - SB_CONF_FILE=sysbuild/nrf54h20dk_nrf54h20_cpurad.conf harness_config: fixture: pca63566 pytest_root: diff --git a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 103b7e5bc2a0..8e188b9bd32c 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -11,11 +11,18 @@ */ / { + aliases { + led = &led0; + /delete-property/ led1; + }; + zephyr,user { test-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; }; }; +/delete-node/ &led1; + &gpiote130 { status = "okay"; owned-channels = <0>; diff --git a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index 1c3b0c34724e..f75dec6ad33b 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/benchmarks/multicore/idle_spim_loopback/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -11,11 +11,18 @@ */ / { + aliases { + led = &led0; + /delete-property/ led1; + }; + zephyr,user { test-gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; }; }; +/delete-node/ &led1; + &gpiote130 { status = "okay"; owned-channels = <0>; diff --git a/tests/benchmarks/multicore/idle_spim_loopback/src/main.c b/tests/benchmarks/multicore/idle_spim_loopback/src/main.c index 1834f5e86476..935ef06880b4 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/src/main.c +++ b/tests/benchmarks/multicore/idle_spim_loopback/src/main.c @@ -15,6 +15,8 @@ LOG_MODULE_REGISTER(idle_spim_loopback, LOG_LEVEL_INF); #include #include +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); + #define DELTA (1) #define SPI_MODE_DEFAULT (SPI_OP_MODE_MASTER | SPI_WORD_SET(8) | SPI_LINES_SINGLE \ @@ -131,10 +133,19 @@ int main(void) .count = 1 }; + ret = gpio_is_ready_dt(&led); + __ASSERT(ret, "Error: GPIO Device not ready"); + #if defined(CONFIG_CLOCK_CONTROL) + ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_INACTIVE); + __ASSERT(ret == 0, "Could not configure led GPIO"); k_msleep(1000); + gpio_pin_set_dt(&led, 1); set_global_domain_frequency(); k_msleep(100); +#else + ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE); + __ASSERT(ret == 0, "Could not configure led GPIO"); #endif LOG_INF("Multicore idle_spi_loopback test on %s", CONFIG_BOARD_TARGET); @@ -322,7 +333,9 @@ int main(void) counter++; /* Sleep / enter low power state. */ + gpio_pin_set_dt(&led, 0); k_msleep(CONFIG_TEST_SLEEP_DURATION_MS); + gpio_pin_set_dt(&led, 1); } return 0; diff --git a/tests/benchmarks/multicore/idle_spim_loopback/sysbuild.cmake b/tests/benchmarks/multicore/idle_spim_loopback/sysbuild.cmake index 4b59a0784f26..bf4119b6a338 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/sysbuild.cmake +++ b/tests/benchmarks/multicore/idle_spim_loopback/sysbuild.cmake @@ -8,7 +8,7 @@ if(SB_CONFIG_SOC_NRF54H20) # Add remote project ExternalZephyrProject_Add( APPLICATION remote - SOURCE_DIR ${SYSBUILD_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever + SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever BOARD ${SB_CONFIG_BOARD}/${SB_CONFIG_SOC}/cpurad BOARD_REVISION ${BOARD_REVISION} ) diff --git a/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml b/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml index d4d63587f721..f0fb0c68453a 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml +++ b/tests/benchmarks/multicore/idle_spim_loopback/testcase.yaml @@ -33,7 +33,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.4_bytes.s2ram: tags: ppk_power_measure @@ -43,7 +43,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.4_bytes.no_sleep_fast: extra_args: @@ -69,7 +69,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.4_bytes.s2ram_fast: tags: ppk_power_measure @@ -80,7 +80,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.4_bytes.gd_freq_256MHz.s2ram_fast: tags: ppk_power_measure @@ -93,7 +93,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.4_bytes.gd_freq_128MHz.s2ram_fast: tags: ppk_power_measure @@ -106,7 +106,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.4_bytes.gd_freq_64MHz.s2ram_fast: tags: ppk_power_measure @@ -119,7 +119,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" # # 16 Bytes of data @@ -149,7 +149,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.16_bytes.s2ram: tags: ppk_power_measure @@ -160,7 +160,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.16_bytes.no_sleep_fast: extra_args: @@ -188,7 +188,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.16_bytes.s2ram_fast: tags: ppk_power_measure @@ -200,7 +200,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.16_bytes.gd_freq_256MHz.s2ram_fast: tags: ppk_power_measure @@ -214,7 +214,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.16_bytes.gd_freq_128MHz.s2ram_fast: tags: ppk_power_measure @@ -228,7 +228,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.16_bytes.gd_freq_64MHz.s2ram_fast: tags: ppk_power_measure @@ -242,7 +242,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" # # 4 Bytes of data with SPI Chip Select Lock enabled @@ -258,7 +258,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" # # 4 Bytes of data with SPI Lock enabled @@ -274,7 +274,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" # # 4 Bytes of data with SPI Chip Select Lock enabled and SPI Lock enabled @@ -308,7 +308,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.4_bytes_cs_and_spi_lock.s2ram: tags: ppk_power_measure @@ -320,7 +320,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.4_bytes_cs_and_spi_lock.no_sleep_fast: extra_args: @@ -352,7 +352,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.4_bytes_cs_and_spi_lock.s2ram_fast: tags: ppk_power_measure @@ -365,7 +365,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" # # 4 Bytes of data with SPI Chip Select Lock enabled and SPI Lock @@ -403,7 +403,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.4_bytes_cs_and_spi_lock_no_release.s2ram: tags: ppk_power_measure @@ -416,7 +416,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" benchmarks.multicore.idle_spim_loopback.4_bytes_cs_and_spi_lock_no_release.no_sleep_fast: extra_args: @@ -451,7 +451,7 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_idle" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_idle" benchmarks.multicore.idle_spim_loopback.4_bytes_cs_and_spi_lock_no_release.s2ram_fast: tags: ppk_power_measure @@ -465,4 +465,4 @@ tests: harness_config: fixture: spi_loopback pytest_root: - - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_pwm_and_s2ram" + - "${CUSTOM_ROOT_TEST_DIR}/test_measure_power_consumption.py::test_measure_and_data_dump_spim_and_s2ram" diff --git a/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay b/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay index 778ba675a3a2..411c0e440cd2 100644 --- a/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay +++ b/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_fast.overlay @@ -4,6 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + &dma_fast_region { status = "okay"; }; diff --git a/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay b/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay index d92790cc0709..ca7874cbd01b 100644 --- a/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay +++ b/tests/benchmarks/multicore/idle_uarte/boards/nrf54h20dk_nrf54h20_cpuapp_normal.overlay @@ -4,6 +4,15 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + &cpuapp_dma_region { status="okay"; }; diff --git a/tests/benchmarks/multicore/idle_uarte/src/main.c b/tests/benchmarks/multicore/idle_uarte/src/main.c index 1d36def4b757..7cb05a730b9e 100644 --- a/tests/benchmarks/multicore/idle_uarte/src/main.c +++ b/tests/benchmarks/multicore/idle_uarte/src/main.c @@ -11,12 +11,15 @@ #include #include #include +#include /* Note: logging is normally disabled for this test * Enable only for debugging purposes */ LOG_MODULE_REGISTER(idle_uarte); +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); + #if DT_NODE_EXISTS(DT_NODELABEL(dut)) #define UART_NODE DT_NODELABEL(dut) #else @@ -145,9 +148,18 @@ int main(void) .data_bits = UART_CFG_DATA_BITS_8, .flow_ctrl = UART_CFG_FLOW_CTRL_RTS_CTS}; + err = gpio_is_ready_dt(&led); + __ASSERT(err, "Error: GPIO Device not ready"); + #if defined(CONFIG_CLOCK_CONTROL) + err = gpio_pin_configure_dt(&led, GPIO_OUTPUT_INACTIVE); + __ASSERT(err == 0, "Could not configure led GPIO"); k_msleep(1000); + gpio_pin_set_dt(&led, 1); set_global_domain_frequency(); +#else + err = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE); + __ASSERT(err == 0, "Could not configure led GPIO"); #endif printk("Hello World! %s\n", CONFIG_BOARD_TARGET); @@ -190,7 +202,9 @@ int main(void) } disable_uart_rx(); printk("Good night\n"); + gpio_pin_set_dt(&led, 0); k_msleep(2000); + gpio_pin_set_dt(&led, 1); } return 0; diff --git a/tests/benchmarks/multicore/idle_uarte/sysbuild.cmake b/tests/benchmarks/multicore/idle_uarte/sysbuild.cmake index 58ef66d8bc99..01a7f9b46ff7 100644 --- a/tests/benchmarks/multicore/idle_uarte/sysbuild.cmake +++ b/tests/benchmarks/multicore/idle_uarte/sysbuild.cmake @@ -11,7 +11,7 @@ endif() # Add remote project ExternalZephyrProject_Add( APPLICATION remote - SOURCE_DIR ${SYSBUILD_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever + SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever BOARD ${SB_CONFIG_REMOTE_BOARD} BOARD_REVISION ${BOARD_REVISION} ) diff --git a/tests/benchmarks/multicore/idle_usb/sysbuild.cmake b/tests/benchmarks/multicore/idle_usb/sysbuild.cmake index 6332228fdd85..71247d7586f5 100644 --- a/tests/benchmarks/multicore/idle_usb/sysbuild.cmake +++ b/tests/benchmarks/multicore/idle_usb/sysbuild.cmake @@ -11,7 +11,7 @@ endif() # Add remote project ExternalZephyrProject_Add( APPLICATION remote - SOURCE_DIR ${SYSBUILD_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever + SOURCE_DIR ${ZEPHYR_NRF_MODULE_DIR}/tests/benchmarks/power_consumption/common/remote_sleep_forever BOARD ${SB_CONFIG_REMOTE_BOARD} BOARD_REVISION ${BOARD_REVISION} ) diff --git a/tests/benchmarks/multicore/idle_wdt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_wdt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 747df7dabb47..baf9da226a49 100644 --- a/tests/benchmarks/multicore/idle_wdt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/multicore/idle_wdt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -6,10 +6,14 @@ / { aliases { + led = &led0; watchdog0 = &wdt010; + /delete-property/ led1; }; }; +/delete-node/ &led1; + &wdt010 { status = "okay"; }; diff --git a/tests/benchmarks/multicore/idle_wdt/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/benchmarks/multicore/idle_wdt/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay index 747df7dabb47..667be57e1f6c 100644 --- a/tests/benchmarks/multicore/idle_wdt/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/tests/benchmarks/multicore/idle_wdt/remote/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -6,8 +6,25 @@ / { aliases { + led = &led1; watchdog0 = &wdt010; }; + + leds { + compatible = "gpio-leds"; + led1: led_1 { + gpios = <&gpio9 1 GPIO_ACTIVE_HIGH>; + label = "Green LED 1"; + }; + }; +}; + +&gpio9 { + status = "okay"; +}; + +&gpiote130 { + status = "okay"; }; &wdt010 { diff --git a/tests/benchmarks/multicore/idle_wdt/remote/prj.conf b/tests/benchmarks/multicore/idle_wdt/remote/prj.conf index a0f56f9968a2..05a94cf19d44 100644 --- a/tests/benchmarks/multicore/idle_wdt/remote/prj.conf +++ b/tests/benchmarks/multicore/idle_wdt/remote/prj.conf @@ -3,3 +3,4 @@ CONFIG_LOG=y CONFIG_LOG_MODE_IMMEDIATE=y CONFIG_ASSERT=y CONFIG_WATCHDOG=y +CONFIG_GPIO=y diff --git a/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf b/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf index bf39c7275b5b..9ee6ed4773d9 100644 --- a/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf +++ b/tests/benchmarks/multicore/idle_wdt/remote/prj_s2ram.conf @@ -7,3 +7,4 @@ CONFIG_SERIAL=n CONFIG_BOOT_BANNER=n CONFIG_WATCHDOG=y +CONFIG_GPIO=y diff --git a/tests/benchmarks/multicore/idle_wdt/src/main.c b/tests/benchmarks/multicore/idle_wdt/src/main.c index 4439d9c7d0e5..1c214f37665d 100644 --- a/tests/benchmarks/multicore/idle_wdt/src/main.c +++ b/tests/benchmarks/multicore/idle_wdt/src/main.c @@ -9,6 +9,9 @@ LOG_MODULE_REGISTER(idle_wdt, LOG_LEVEL_INF); #include #include +#include + +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); #define WDT_WINDOW_MAX (200) @@ -48,6 +51,12 @@ int main(void) int ret; int counter = 0; + ret = gpio_is_ready_dt(&led); + __ASSERT(ret, "Error: GPIO Device not ready"); + + ret = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE); + __ASSERT(ret == 0, "Could not configure led GPIO"); + LOG_INF("Multicore idle_wdt test on %s", CONFIG_BOARD_TARGET); LOG_INF("Main sleeps for %d ms", CONFIG_TEST_SLEEP_DURATION_MS); @@ -122,7 +131,9 @@ int main(void) * Watchdog was started with option WDT_OPT_PAUSE_IN_SLEEP thus * it shall not reset the core during sleep. */ + gpio_pin_set_dt(&led, 0); k_msleep(CONFIG_TEST_SLEEP_DURATION_MS); + gpio_pin_set_dt(&led, 1); } return 0; diff --git a/tests/benchmarks/power_consumption/adc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/adc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index e20f5b9ff627..6ff5e790222a 100644 --- a/tests/benchmarks/power_consumption/adc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/adc/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,9 +1,13 @@ / { aliases { + led = &led0; + /delete-property/ led1; adc0 = &adc; }; }; +/delete-node/ &led1; + &adc { #address-cells = <1>; #size-cells = <0>; diff --git a/tests/benchmarks/power_consumption/adc/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/adc/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index e20f5b9ff627..a798998bf597 100644 --- a/tests/benchmarks/power_consumption/adc/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/adc/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,5 +1,6 @@ / { aliases { + led = &button3; adc0 = &adc; }; }; diff --git a/tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index e20f5b9ff627..6ff5e790222a 100644 --- a/tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/adc_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,9 +1,13 @@ / { aliases { + led = &led0; + /delete-property/ led1; adc0 = &adc; }; }; +/delete-node/ &led1; + &adc { #address-cells = <1>; #size-cells = <0>; diff --git a/tests/benchmarks/power_consumption/adc_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/adc_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index e20f5b9ff627..a798998bf597 100644 --- a/tests/benchmarks/power_consumption/adc_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/adc_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,5 +1,6 @@ / { aliases { + led = &button3; adc0 = &adc; }; }; diff --git a/tests/benchmarks/power_consumption/common/main.c b/tests/benchmarks/power_consumption/common/main.c index e46ee0cc1b3b..acc5d1a6c26a 100644 --- a/tests/benchmarks/power_consumption/common/main.c +++ b/tests/benchmarks/power_consumption/common/main.c @@ -7,7 +7,7 @@ #include #include -const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led2), gpios); +const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); static bool state = true; extern void thread_definition(void); diff --git a/tests/benchmarks/power_consumption/common/remote_sleep_forever/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/benchmarks/power_consumption/common/remote_sleep_forever/boards/nrf54h20dk_nrf54h20_cpurad.overlay index c00bfcbf9464..9f3e7f8babb5 100644 --- a/tests/benchmarks/power_consumption/common/remote_sleep_forever/boards/nrf54h20dk_nrf54h20_cpurad.overlay +++ b/tests/benchmarks/power_consumption/common/remote_sleep_forever/boards/nrf54h20dk_nrf54h20_cpurad.overlay @@ -4,6 +4,28 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ +/ { + aliases { + led = &led1; + }; + + leds { + compatible = "gpio-leds"; + led1: led_1 { + gpios = <&gpio9 1 GPIO_ACTIVE_HIGH>; + label = "Green LED 1"; + }; + }; +}; + +&gpio9 { + status = "okay"; +}; + +&gpiote130 { + status = "okay"; +}; + &uart135 { status = "disabled"; /delete-property/memory-regions; diff --git a/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf b/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf index 136c013a406a..f6b9a2213bde 100644 --- a/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf +++ b/tests/benchmarks/power_consumption/common/remote_sleep_forever/prj.conf @@ -3,5 +3,5 @@ CONFIG_POWEROFF=y CONFIG_CONSOLE=n CONFIG_UART_CONSOLE=n CONFIG_SERIAL=n -CONFIG_GPIO=n +CONFIG_GPIO=y CONFIG_BOOT_BANNER=n diff --git a/tests/benchmarks/power_consumption/common/remote_sleep_forever/src/main.c b/tests/benchmarks/power_consumption/common/remote_sleep_forever/src/main.c index 4e67aa67ab75..b3528ebdbc61 100644 --- a/tests/benchmarks/power_consumption/common/remote_sleep_forever/src/main.c +++ b/tests/benchmarks/power_consumption/common/remote_sleep_forever/src/main.c @@ -4,10 +4,14 @@ * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause */ #include +#include + +static const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led), gpios); int main(void) { + gpio_pin_configure_dt(&led, GPIO_OUTPUT_INACTIVE); k_sleep(K_FOREVER); return 0; diff --git a/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index de3817d265be..43a16d5f1c9c 100644 --- a/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -4,6 +4,10 @@ / { aliases { + led = &led0; + /delete-property/ led1; jedec-spi-nor = &mx25uw63; }; }; + +/delete-node/ &led1; diff --git a/tests/benchmarks/power_consumption/flash/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/flash/boards/nrf54l15dk_nrf54l15_cpuapp.overlay new file mode 100644 index 000000000000..c2be688cbf32 --- /dev/null +++ b/tests/benchmarks/power_consumption/flash/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -0,0 +1,5 @@ +/ { + aliases { + led = &button3; + }; +}; diff --git a/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 0d182bd14198..830f86f31ed6 100644 --- a/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/gpio/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,5 +1,7 @@ / { aliases { + led = &led0; + /delete-property/ led1; out0 = &output0; in0 = &input0; }; @@ -23,6 +25,8 @@ }; }; +/delete-node/ &led1; + &gpiote130 { status = "okay"; owned-channels = <0>; diff --git a/tests/benchmarks/power_consumption/gpio/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/gpio/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index a1137fc83e18..dc71e1f1de49 100644 --- a/tests/benchmarks/power_consumption/gpio/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/gpio/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,5 +1,6 @@ / { aliases { + led = &button3; /delete-property/ sw1; /delete-property/ sw2; out0 = &output0; diff --git a/tests/benchmarks/power_consumption/i2c/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/i2c/boards/nrf54h20dk_nrf54h20_cpuapp.overlay new file mode 100644 index 000000000000..b38ee1e10497 --- /dev/null +++ b/tests/benchmarks/power_consumption/i2c/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -0,0 +1,8 @@ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; diff --git a/tests/benchmarks/power_consumption/i2c/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/i2c/boards/nrf54l15dk_nrf54l15_cpuapp.overlay new file mode 100644 index 000000000000..c2be688cbf32 --- /dev/null +++ b/tests/benchmarks/power_consumption/i2c/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -0,0 +1,5 @@ +/ { + aliases { + led = &button3; + }; +}; diff --git a/tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 0c1168166ce0..5822901392b6 100644 --- a/tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/lpcomp/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -6,6 +6,8 @@ / { aliases { + led = &led0; + /delete-property/ led1; test-comp = ∁ }; @@ -14,6 +16,8 @@ }; }; +/delete-node/ &led1; + &gpio1 { status = "okay"; }; diff --git a/tests/benchmarks/power_consumption/lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 3b4f8db0af43..9f00e69a1512 100644 --- a/tests/benchmarks/power_consumption/lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/lpcomp/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -6,6 +6,7 @@ / { aliases { + led = &button3; test-comp = ∁ }; diff --git a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index b99498949480..488a3d171bd1 100644 --- a/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/qdec/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -5,6 +5,8 @@ / { aliases { + led = &led0; + /delete-property/ led1; qdec0 = &qdec130; qenca = &phase_a; qencb = &phase_b; @@ -21,6 +23,8 @@ }; }; +/delete-node/ &led1; + &pinctrl { qdec_pinctrl: qdec_pinctrl { group1 { diff --git a/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 03a876ee77f0..004a3984d9d9 100644 --- a/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/qdec/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -5,6 +5,7 @@ / { aliases { + led = &button3; qdec0 = &qdec20; qenca = &phase_a; qencb = &phase_b; diff --git a/tests/benchmarks/power_consumption/qdec/src/main.c b/tests/benchmarks/power_consumption/qdec/src/main.c index ba5b0867a2a2..9f4f96727678 100644 --- a/tests/benchmarks/power_consumption/qdec/src/main.c +++ b/tests/benchmarks/power_consumption/qdec/src/main.c @@ -16,6 +16,8 @@ extern struct k_sem semaphore; +const struct gpio_dt_spec led = GPIO_DT_SPEC_GET(DT_ALIAS(led0), gpios); + static const struct gpio_dt_spec phase_a = GPIO_DT_SPEC_GET(DT_ALIAS(qenca), gpios); static const struct gpio_dt_spec phase_b = GPIO_DT_SPEC_GET(DT_ALIAS(qencb), gpios); static const struct device *const qdec_dev = DEVICE_DT_GET(DT_ALIAS(qdec0)); @@ -120,6 +122,12 @@ int main(void) { int rc; + rc = gpio_is_ready_dt(&led); + __ASSERT(rc, "Error: GPIO Device not ready"); + + rc = gpio_pin_configure_dt(&led, GPIO_OUTPUT_ACTIVE); + __ASSERT(rc == 0, "Could not configure led GPIO"); + init_device(); while (1) { @@ -133,7 +141,9 @@ int main(void) rc = pm_device_runtime_put(qdec_dev); __ASSERT_NO_MSG(rc == 0); } + gpio_pin_set_dt(&led, 0); k_msleep(1000); + gpio_pin_set_dt(&led, 1); } return 0; } diff --git a/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index cba120d18469..c26046870c8b 100644 --- a/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/spi/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,6 +1,16 @@ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + &spi131 { zephyr,pm-device-runtime-auto; }; + &exmif { status = "disabled"; }; diff --git a/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 8f958fd87a62..d36cf6cee96f 100644 --- a/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/spi/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,3 +1,9 @@ +/ { + aliases { + led = &button3; + }; +}; + &spi21 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 012c93a8fa81..cb64f6cdbdcc 100644 --- a/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/temperature_sensor/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,3 +1,12 @@ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + temp_sensor: &temp_nrfs { status = "okay"; }; diff --git a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_16M.overlay b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_16M.overlay index 44f44943e42d..e6ff329ee02c 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_16M.overlay +++ b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_16M.overlay @@ -2,6 +2,8 @@ / { aliases { + led = &led0; + /delete-property/ led1; counter = &timer130; }; }; @@ -9,3 +11,5 @@ &timer130 { status = "okay"; }; + +/delete-node/ &led1; diff --git a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_320M.overlay b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_320M.overlay index 9b9517bd4ce7..c254423bea54 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_320M.overlay +++ b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54h20dk_nrf54h20_cpuapp_320M.overlay @@ -2,6 +2,8 @@ / { aliases { + led = &led0; + /delete-property/ led1; counter = &timer120; }; }; @@ -9,3 +11,5 @@ &timer120 { status = "okay"; }; + +/delete-node/ &led1; diff --git a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_128M.overlay b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_128M.overlay index 9e108b80fd75..00c7a5c0c90a 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_128M.overlay +++ b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_128M.overlay @@ -2,6 +2,7 @@ / { aliases { + led = &button3; counter = &timer00; }; }; diff --git a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_16M.overlay b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_16M.overlay index 54871207cab3..e00675ee5334 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_16M.overlay +++ b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_16M.overlay @@ -2,6 +2,7 @@ / { aliases { + led = &button3; counter = &timer20; }; }; diff --git a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_32M.overlay b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_32M.overlay index 59a6e9fa15d2..ec9f52ec8387 100644 --- a/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_32M.overlay +++ b/tests/benchmarks/power_consumption/timer_waiting/boards/nrf54l15dk_nrf54l15_cpuapp_32M.overlay @@ -2,6 +2,7 @@ / { aliases { + led = &button3; counter = &timer10; }; }; diff --git a/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 1baa97c9f522..9e4a50a3248a 100644 --- a/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_async/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,3 +1,12 @@ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + &uart136 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 3346b3329c96..0e5633f83d64 100644 --- a/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_async/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,3 +1,9 @@ +/ { + aliases { + led = &button3; + }; +}; + &uart20 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 1baa97c9f522..9e4a50a3248a 100644 --- a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,3 +1,12 @@ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + &uart136 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 3346b3329c96..0e5633f83d64 100644 --- a/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_interrupt/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,3 +1,9 @@ +/ { + aliases { + led = &button3; + }; +}; + &uart20 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 1baa97c9f522..9e4a50a3248a 100644 --- a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -1,3 +1,12 @@ +/ { + aliases { + led = &led0; + /delete-property/ led1; + }; +}; + +/delete-node/ &led1; + &uart136 { zephyr,pm-device-runtime-auto; }; diff --git a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay index 3346b3329c96..0e5633f83d64 100644 --- a/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay +++ b/tests/benchmarks/power_consumption/uart_polling/boards/nrf54l15dk_nrf54l15_cpuapp.overlay @@ -1,3 +1,9 @@ +/ { + aliases { + led = &button3; + }; +}; + &uart20 { zephyr,pm-device-runtime-auto; };