diff --git a/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi b/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi index 875e711677bd..a9f7ae9fd292 100644 --- a/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi +++ b/samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi @@ -32,3 +32,54 @@ &cpusec_bellboard { status = "okay"; }; + +/* Legacy exmif driver overlay - currently needed for DFU from extmem */ + +&exmif_default { + group1 { + psels = , + , + ; + nordic,drive-mode = ; + }; +}; + +/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 = ; + 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 = ; + 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>; + }; +}; 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 = , + , + ; + nordic,drive-mode = ; + }; +}; + +/* 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 = ; + 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 = ; + 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/flash_companion/prj.conf b/samples/suit/flash_companion/prj.conf index 3422f8d9ebd2..24223dfcadf2 100644 --- a/samples/suit/flash_companion/prj.conf +++ b/samples/suit/flash_companion/prj.conf @@ -17,6 +17,9 @@ CONFIG_GPIO=y CONFIG_PINCTRL=y CONFIG_FLASH=y +# Disable unused XIP feature in the MSPI driver +CONFIG_MSPI_XIP=n + # Disable power management CONFIG_PM=n 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 = , + , + ; + nordic,drive-mode = ; + }; +}; + +/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 = ; + 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 = ; + 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 { diff --git a/tests/benchmarks/multicore/idle_spim_loopback/src/main.c b/tests/benchmarks/multicore/idle_spim_loopback/src/main.c index 82e60cc57b0c..e66ab97c56fd 100644 --- a/tests/benchmarks/multicore/idle_spim_loopback/src/main.c +++ b/tests/benchmarks/multicore/idle_spim_loopback/src/main.c @@ -275,8 +275,8 @@ int main(void) /* SPI was active for ~1 second with separate SPI CS activations * for each spi_transceive_dt() call. */ - __ASSERT_NO_MSG(high >= 1000); - __ASSERT_NO_MSG(low >= 1000); + __ASSERT_NO_MSG(high >= 100); + __ASSERT_NO_MSG(low >= 100); __ASSERT_NO_MSG(low == high); #endif counter++; diff --git a/west.yml b/west.yml index 4fbec25f04b9..797bad29c424 100644 --- a/west.yml +++ b/west.yml @@ -69,7 +69,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 9edbdaf1cc6b20e1a070b9ce20bde88a30f5c35c + revision: f5efb381b8af563600f327c2273b117d0ef7f785 import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above