Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

manifest: sdk-zephyr: [nrf fromlist] Cherry-pick updated upstream commit related to MSPI driver for EXMIF #19574

Merged
merged 5 commits into from
Dec 18, 2024
Merged

manifest: sdk-zephyr: [nrf fromlist] Cherry-pick updated upstream commit related to MSPI driver for EXMIF #19574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd8c669
samples: suit: flash_companion: Disable XIP in MSPI driver
anangl Dec 17, 2024
cd8e668
tests: benchmarks: idle_spim_loopback: reduce expected SPI xfers
nika-nordic Dec 10, 2024
9c5d65e
manifest: Update sdk-zephyr revision (auto-manifest PR)
NordicBuilder Dec 17, 2024
8bd7f30
samples: suit: Switch to legacy exmif driver
ahasztag Dec 17, 2024
6135792
samples: matter: Switch to legacy exmif driver
ArekBalysNordic Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 51 additions & 0 deletions samples/matter/common/dts/nrf54h20/nrf54h20_cpuapp_peripherals.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,54 @@
&cpusec_bellboard {
status = "okay";
};

/* 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>;
};
};
60 changes: 56 additions & 4 deletions samples/suit/flash_companion/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
status = "okay";
};

&mx25uw63 {
status = "okay";
};

&uart136 {
status = "disabled";
};
Expand All @@ -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";
};
3 changes: 3 additions & 0 deletions samples/suit/flash_companion/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
51 changes: 51 additions & 0 deletions samples/suit/smp_transfer/boards/nrf54h20dk_nrf54h20_cpuapp_extflash.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions tests/benchmarks/multicore/idle_spim_loopback/src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++;
Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading