From 27969209a6a68a4fdc4e3311157fa5898fd7d819 Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 12 Aug 2025 12:18:11 +0200
Subject: [PATCH 1/2] [nrf fromlist] tests: arch: arm: irq vt: disable power
 domains (NRFS)

The power domains on the nrf54h20dk require NRFS, which uses some
of the irq vectors reserved for the test. Disable power domains
and its drivers to free the irq vectors.

Upstream PR #: 94392

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.conf    |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 49 +++++++++++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpurad.conf    |  1 +
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay | 48 ++++++++++++++++++
 4 files changed, 99 insertions(+)

diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
index a18a3b576e3..2b2e0ddd88d 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.conf
@@ -1 +1,2 @@
 CONFIG_SSF_CLIENT_SYS_INIT=n
+CONFIG_POWER_DOMAIN=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index d1566b5aa63..204c932b102 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -11,3 +11,52 @@
 &cpusec_bellboard{
 	status = "disabled";
 };
+
+
+&gdpwr {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_0 {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_1 {
+	status = "disabled";
+};
+
+&gdpwr_fast_main {
+	status = "disabled";
+};
+
+&gdpwr_slow_active {
+	status = "disabled";
+};
+
+&gdpwr_slow_main {
+	status = "disabled";
+};
+
+&gpio_pad_group0 {
+	status = "disabled";
+};
+
+&gpio_pad_group1 {
+	status = "disabled";
+};
+
+&gpio_pad_group2 {
+	status = "disabled";
+};
+
+&gpio_pad_group6 {
+	status = "disabled";
+};
+
+&gpio_pad_group7 {
+	status = "disabled";
+};
+
+&gpio_pad_group9 {
+	status = "disabled";
+};
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
index a18a3b576e3..2b2e0ddd88d 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.conf
@@ -1 +1,2 @@
 CONFIG_SSF_CLIENT_SYS_INIT=n
+CONFIG_POWER_DOMAIN=n
diff --git a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index 04c22168b6c..03860311d1e 100644
--- a/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/tests/arch/arm/arm_irq_vector_table/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -11,3 +11,51 @@
 &cpusec_bellboard{
 	status = "disabled";
 };
+
+&gdpwr {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_0 {
+	status = "disabled";
+};
+
+&gdpwr_fast_active_1 {
+	status = "disabled";
+};
+
+&gdpwr_fast_main {
+	status = "disabled";
+};
+
+&gdpwr_slow_active {
+	status = "disabled";
+};
+
+&gdpwr_slow_main {
+	status = "disabled";
+};
+
+&gpio_pad_group0 {
+	status = "disabled";
+};
+
+&gpio_pad_group1 {
+	status = "disabled";
+};
+
+&gpio_pad_group2 {
+	status = "disabled";
+};
+
+&gpio_pad_group6 {
+	status = "disabled";
+};
+
+&gpio_pad_group7 {
+	status = "disabled";
+};
+
+&gpio_pad_group9 {
+	status = "disabled";
+};

From 54736494fa1534af6bb4810ccb4e4dafcec184cf Mon Sep 17 00:00:00 2001
From: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
Date: Tue, 12 Aug 2025 13:21:19 +0200
Subject: [PATCH 2/2] [nrf fromlist] tests: spi: spi ctrl peri: nrf54h20dk
 cpurad uart135 device runtime

Add zephyr,pm-device-runtime-auto; to uart135 which is the uart
used for logging to enable PM_DEVICE_RUNTIME for it, which is
required for its power domains.

Upstream PR #: 94399

Signed-off-by: Bjarki Arge Andreasen <bjarki.andreasen@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpurad.overlay                 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
index 84edfb2b6f1..9db6ced88d7 100644
--- a/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
+++ b/tests/drivers/spi/spi_controller_peripheral/boards/nrf54h20dk_nrf54h20_cpurad.overlay
@@ -12,3 +12,7 @@
 &dut_spis {
 	memory-regions = <&cpurad_dma_region>;
 };
+
+&uart135 {
+	zephyr,pm-device-runtime-auto;
+};