From 9efc23cbc0bec5629e1f5f9f6dc69f1c086e32eb Mon Sep 17 00:00:00 2001
From: Artur Hadasz <artur.hadasz@nordicsemi.no>
Date: Tue, 17 Dec 2024 22:30:21 +0100
Subject: [PATCH] samples: suit: Switch to legacy exmif driver

The flash_companion image needed to perform SUIT update
from external memory currently requires to use the legacy
SPI instead of the new MSPI driver.

Signed-off-by: Artur Hadasz <artur.hadasz@nordicsemi.no>
---
 .../boards/nrf54h20dk_nrf54h20_cpuapp.overlay | 60 +++++++++++++++++--
 ...rf54h20dk_nrf54h20_cpuapp_extflash.overlay | 51 ++++++++++++++++
 2 files changed, 107 insertions(+), 4 deletions(-)

diff --git a/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
index 3a8d40954fb0..afbf08643e14 100644
--- a/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ b/samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
@@ -23,10 +23,6 @@
 	status = "okay";
 };
 
-&mx25uw63 {
-	status = "okay";
-};
-
 &uart136 {
 	status = "disabled";
 };
@@ -46,3 +42,59 @@
 &prng {
 	status = "disabled";
 };
+
+
+&exmif_default {
+	group1 {
+		psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+			<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+			<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+		nordic,drive-mode = <NRF_DRIVE_H0H1>;
+	};
+};
+
+/* Legacy exmif driver overlay - currently needed for DFU from extmem */
+
+/delete-node/ &exmif;
+
+&global_peripherals {
+	exmif: spi@95000 {
+		compatible = "nordic,nrf-exmif-spi", "snps,designware-spi";
+		pinctrl-0 = <&exmif_default>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x95000 0x500 0x95500 0xb00>;
+		reg-names = "wrapper", "core";
+		interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
+		power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
+		clock-frequency = <DT_FREQ_M(400)>;
+		fifo-depth = <32>;
+		max-xfer-size = <16>;
+		cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&exmif {
+	mx25uw63: mx25uw6345g@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
+		jedec-id = [c2 84 37];
+		sfdp-bfp = [
+			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
+			ee ff ff ff  ff ff 00 ff  ff ff 00 ff  0c 20 10 d8
+			00 ff 00 ff  87 79 01 00  84 12 00 c4  cc 04 67 46
+			30 b0 30 b0  f4 bd d5 5c  00 00 00 ff  10 10 00 20
+			00 00 00 00  00 00 7c 23  48 00 00 00  00 00 88 88
+		];
+		size = <67108864>;
+		has-dpd;
+		t-enter-dpd = <10000>;
+		t-exit-dpd = <30000>;
+	};
+};
+
+&mx25uw63 {
+	status = "okay";
+};
diff --git a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay
index abd9415d25f0..f31b045ee86d 100644
--- a/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay
+++ b/samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay
@@ -10,6 +10,57 @@
 	};
 };
 
+/* Legacy exmif driver overlay - currently needed for DFU from extmem */
+
+&exmif_default {
+	group1 {
+		psels = <NRF_PSEL(EXMIF_CK, 6, 0)>,
+			<NRF_PSEL(EXMIF_DQ0, 6, 7)>,
+			<NRF_PSEL(EXMIF_DQ1, 6, 5)>;
+		nordic,drive-mode = <NRF_DRIVE_H0H1>;
+	};
+};
+
+/delete-node/ &exmif;
+
+&global_peripherals {
+	exmif: spi@95000 {
+		compatible = "nordic,nrf-exmif-spi", "snps,designware-spi";
+		pinctrl-0 = <&exmif_default>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		reg = <0x95000 0x500 0x95500 0xb00>;
+		reg-names = "wrapper", "core";
+		interrupts = <149 NRF_DEFAULT_IRQ_PRIORITY>;
+		power-domains = <&gpd NRF_GPD_FAST_ACTIVE0>;
+		clock-frequency = <DT_FREQ_M(400)>;
+		fifo-depth = <32>;
+		max-xfer-size = <16>;
+		cs-gpios = <&gpio6 3 GPIO_ACTIVE_LOW>;
+	};
+};
+
+&exmif {
+	mx25uw63: mx25uw6345g@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <DT_FREQ_M(48)>;
+		jedec-id = [c2 84 37];
+		sfdp-bfp = [
+			e5 20 8a ff  ff ff ff 03  00 ff 00 ff  00 ff 00 ff
+			ee ff ff ff  ff ff 00 ff  ff ff 00 ff  0c 20 10 d8
+			00 ff 00 ff  87 79 01 00  84 12 00 c4  cc 04 67 46
+			30 b0 30 b0  f4 bd d5 5c  00 00 00 ff  10 10 00 20
+			00 00 00 00  00 00 7c 23  48 00 00 00  00 00 88 88
+		];
+		size = <67108864>;
+		has-dpd;
+		t-enter-dpd = <10000>;
+		t-exit-dpd = <30000>;
+	};
+};
+
 &mx25uw63 {
 	status = "okay";
 	partitions {