From 2cafc3afe0eb3b06dcb77c90d2fadc7d21348176 Mon Sep 17 00:00:00 2001
From: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
Date: Wed, 6 Aug 2025 17:57:20 +0200
Subject: [PATCH] [nrf fromlist] boards: nordic: nrf54h20dk: Disable EXMIF and
 GPIO6 by default

External flash memory is typically not used, so it should
be disabled by default. The GPIO6 port used by this device
should also be disabled.

Upstream PR #: 94180

Signed-off-by: Adam Kondraciuk <adam.kondraciuk@nordicsemi.no>
(cherry picked from commit 63febf7715f82807e3b70eb33b3365a7372412a8)
---
 .../nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts   |  4 ++--
 .../jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay  | 10 ++++++++++
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay          | 10 ++++++++++
 .../common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay   | 10 ++++++++++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
index 3846627ab1a..994d16242f4 100644
--- a/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
+++ b/boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20_cpuapp.dts
@@ -264,14 +264,14 @@ slot3_partition: &cpurad_slot1_partition {
 };
 
 &gpio6 {
-	status = "okay";
+	status = "disabled";
 };
 
 &exmif {
 	pinctrl-0 = <&exmif_default>;
 	pinctrl-1 = <&exmif_sleep>;
 	pinctrl-names = "default", "sleep";
-	status = "okay";
+	status = "disabled";
 
 	mx25uw63: mx25uw6345g@0 {
 		compatible = "mxicy,mx25u", "jedec,mspi-nor";
diff --git a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index b8f138ad2b2..22c24c32f6d 100644
--- a/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/drivers/jesd216/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,6 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+&gpio6 {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
+&exmif {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
 &mx25uw63 {
 	status = "okay";
 };
diff --git a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index b8f138ad2b2..22c24c32f6d 100644
--- a/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/drivers/spi_flash/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,6 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+&gpio6 {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
+&exmif {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
 &mx25uw63 {
 	status = "okay";
 };
diff --git a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index b8f138ad2b2..22c24c32f6d 100644
--- a/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/tests/drivers/flash/common/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -4,6 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+&gpio6 {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
+&exmif {
+	status = "okay";
+	zephyr,pm-device-runtime-auto;
+};
+
 &mx25uw63 {
 	status = "okay";
 };