tests: multicore: Use power states definition from SOC

Instead of defining power states per test, add power states to the nrf54h20/cpuapp target definition. Remove power states from tests overlays to prevent build failures due to duplicated node definitions. Signed-off-by: Sebastian Głąb <sebastian.glab@nordicsemi.no>
nrfconnect · Sep 27, 2024 · 648ffc8 · 648ffc8
1 parent fb290bd
commit 648ffc8
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 71 deletions.
diff --git a/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay b/tests/benchmarks/multicore/idle/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay
diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml
@@ -76,7 +76,6 @@ tests:
  remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
  remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
  remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay"
  harness: pytest
  harness_config:
  fixture: ppk_power_measure
@@ -98,7 +97,7 @@ tests:
  remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
  remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
  remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay;boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay"
+ DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_high_usage.overlay"
  harness: pytest
  harness_config:
  fixture: ppk_power_measure
@@ -120,7 +119,7 @@ tests:
  remote_CONFIG_PM=y remote_CONFIG_POWEROFF=y remote_CONFIG_CONSOLE=n
  remote_CONFIG_UART_CONSOLE=n remote_CONFIG_SERIAL=n remote_CONFIG_GPIO=n
  remote_CONFIG_BOOT_BANNER=n remote_CONFIG_NRFS_MRAM_SERVICE_ENABLED=n
- DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay;boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay"
+ DTC_OVERLAY_FILE="boards/nrf54h20dk_nrf54h20_cpuapp_ram_low_usage.overlay"
  harness: pytest
  harness_config:
  fixture: ppk_power_measure

diff --git a/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay b/tests/benchmarks/multicore/idle_gpio/boards/nrf54h20dk_nrf54h20_cpuapp_s2ram.overlay
@@ -5,30 +5,13 @@
  */
 
 / {
- power-states {
- idle: idle {
- compatible = "zephyr,power-state";
- power-state-name = "suspend-to-idle";
- min-residency-us = <100000>;
- };
-
- s2ram: s2ram {
- compatible = "zephyr,power-state";
- power-state-name = "suspend-to-ram";
- min-residency-us = <800000>;
- };
- };
  aliases {
  /delete-property/ sw1;
  };
 };
 
 /delete-node/ &button1;
 
-&cpu {
- cpu-power-states = <&idle &s2ram>;
-};
-
 &gpiote130 {
  status = "okay";
  owned-channels = <0>;

diff --git a/tests/benchmarks/multicore/idle_with_pwm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/benchmarks/multicore/idle_with_pwm/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
diff --git a/west.yml b/west.yml
@@ -72,7 +72,7 @@ manifest:
  # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
  - name: zephyr
  repo-path: sdk-zephyr
- revision: 3d01dcc251bf3aa2a675941e8ac2b244f776724d
+ revision: pull/2052/head
  import:
  # In addition to the zephyr repository itself, NCS also
  # imports the contents of zephyr/west.yml at the above