Skip to content

Commit 982297e

Browse files
5730057300
committed
[nrf fromtree] boards: nordic: Flatten shared_ramxx_region nodes
Update the default memory maps for `nrf54h20dk` and `nrf9280pdk` to remove the `shared_ram20_region` and `shared_ram3x_region` nodes, because their child nodes no longer need to be grouped together: * IPC buffers in RAM20 are statically allocated. * DMA buffers in RAM3x have separate access owners. Signed-off-by: Grzegorz Swiderski <[email protected]> (cherry picked from commit 85b0394)
1 parent bb0445a commit 982297e

File tree

3 files changed

+56
-88
lines changed

3 files changed

+56
-88
lines changed

‎boards/nordic/nrf54h20dk/nrf54h20dk_nrf54h20-memory_map.dtsi‎

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -81,27 +81,20 @@
8181
};
8282
};
8383

84-
shared_ram20_region: memory@2f88f000 {
85-
reg = <0x2f88f000 DT_SIZE_K(4)>;
86-
#address-cells = <1>;
87-
#size-cells = <1>;
88-
ranges = <0x0 0x2f88f000 0x1000>;
89-
90-
cpuapp_cpusys_ipc_shm: memory@ce0 {
91-
reg = <0xce0 0x80>;
92-
};
84+
cpuapp_cpusys_ipc_shm: memory@2f88fce0 {
85+
reg = <0x2f88fce0 0x80>;
86+
};
9387

94-
cpusys_cpuapp_ipc_shm: memory@d60 {
95-
reg = <0xd60 0x80>;
96-
};
88+
cpusys_cpuapp_ipc_shm: memory@2f88fd60 {
89+
reg = <0x2f88fd60 0x80>;
90+
};
9791

98-
cpurad_cpusys_ipc_shm: memory@e00 {
99-
reg = <0xe00 0x80>;
100-
};
92+
cpurad_cpusys_ipc_shm: memory@2f88fe00 {
93+
reg = <0x2f88fe00 0x80>;
94+
};
10195

102-
cpusys_cpurad_ipc_shm: memory@e80 {
103-
reg = <0xe80 0x80>;
104-
};
96+
cpusys_cpurad_ipc_shm: memory@2f88fe80 {
97+
reg = <0x2f88fe80 0x80>;
10598
};
10699

107100
/*
@@ -162,31 +155,24 @@
162155
};
163156
};
164157

165-
shared_ram3x_region: memory@2fc12000 {
166-
reg = <0x2fc12000 DT_SIZE_K(8)>;
167-
#address-cells = <1>;
168-
#size-cells = <1>;
169-
ranges = <0x0 0x2fc12000 0x2000>;
170-
171-
cpuapp_dma_region: memory@0 {
172-
compatible = "nordic,owned-memory", "zephyr,memory-region";
173-
reg = <0x0 DT_SIZE_K(4)>;
174-
status = "disabled";
175-
#memory-region-cells = <0>;
176-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
177-
zephyr,memory-region = "DMA_RAM3x_APP";
178-
zephyr,memory-attr = <( DT_MEM_DMA )>;
179-
};
158+
cpuapp_dma_region: memory@2fc12000 {
159+
compatible = "nordic,owned-memory", "zephyr,memory-region";
160+
reg = <0x2fc12000 DT_SIZE_K(4)>;
161+
status = "disabled";
162+
#memory-region-cells = <0>;
163+
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
164+
zephyr,memory-region = "DMA_RAM3x_APP";
165+
zephyr,memory-attr = <( DT_MEM_DMA )>;
166+
};
180167

181-
cpurad_dma_region: memory@1000 {
182-
compatible = "nordic,owned-memory", "zephyr,memory-region";
183-
reg = <0x1000 DT_SIZE_K(1)>;
184-
status = "disabled";
185-
#memory-region-cells = <0>;
186-
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
187-
zephyr,memory-region = "DMA_RAM3x_RAD";
188-
zephyr,memory-attr = <( DT_MEM_DMA )>;
189-
};
168+
cpurad_dma_region: memory@2fc13000 {
169+
compatible = "nordic,owned-memory", "zephyr,memory-region";
170+
reg = <0x2fc13000 DT_SIZE_K(1)>;
171+
status = "disabled";
172+
#memory-region-cells = <0>;
173+
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
174+
zephyr,memory-region = "DMA_RAM3x_RAD";
175+
zephyr,memory-attr = <( DT_MEM_DMA )>;
190176
};
191177
};
192178
};

‎boards/nordic/nrf9280pdk/nrf9280pdk_nrf9280-memory_map.dtsi‎

Lines changed: 28 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -98,27 +98,20 @@
9898
};
9999
};
100100

101-
shared_ram20_region: memory@2f88f000 {
102-
reg = <0x2f88f000 DT_SIZE_K(4)>;
103-
#address-cells = <1>;
104-
#size-cells = <1>;
105-
ranges = <0x0 0x2f88f000 0x1000>;
106-
107-
cpuapp_cpusys_ipc_shm: memory@ce0 {
108-
reg = <0xce0 0x80>;
109-
};
101+
cpuapp_cpusys_ipc_shm: memory@2f88fce0 {
102+
reg = <0x2f88fce0 0x80>;
103+
};
110104

111-
cpusys_cpuapp_ipc_shm: memory@d60 {
112-
reg = <0xd60 0x80>;
113-
};
105+
cpusys_cpuapp_ipc_shm: memory@2f88fd60 {
106+
reg = <0x2f88fd60 0x80>;
107+
};
114108

115-
cpurad_cpusys_ipc_shm: memory@e00 {
116-
reg = <0xe00 0x80>;
117-
};
109+
cpurad_cpusys_ipc_shm: memory@2f88fe00 {
110+
reg = <0x2f88fe00 0x80>;
111+
};
118112

119-
cpusys_cpurad_ipc_shm: memory@e80 {
120-
reg = <0xe80 0x80>;
121-
};
113+
cpusys_cpurad_ipc_shm: memory@2f88fe80 {
114+
reg = <0x2f88fe80 0x80>;
122115
};
123116

124117
ram21_region: memory@2f890000 {
@@ -162,31 +155,24 @@
162155
};
163156
};
164157

165-
shared_ram3x_region: memory@2fc06000 {
166-
reg = <0x2fc06000 DT_SIZE_K(8)>;
167-
#address-cells = <1>;
168-
#size-cells = <1>;
169-
ranges = <0x0 0x2fc06000 0x4000>;
170-
171-
cpuapp_dma_region: memory@0 {
172-
compatible = "nordic,owned-memory", "zephyr,memory-region";
173-
reg = <0x0 DT_SIZE_K(4)>;
174-
status = "disabled";
175-
#memory-region-cells = <0>;
176-
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
177-
zephyr,memory-region = "DMA_RAM3x_APP";
178-
zephyr,memory-attr = <( DT_MEM_DMA )>;
179-
};
158+
cpuapp_dma_region: memory@2fc06000 {
159+
compatible = "nordic,owned-memory", "zephyr,memory-region";
160+
reg = <0x2fc06000 DT_SIZE_K(4)>;
161+
status = "disabled";
162+
#memory-region-cells = <0>;
163+
nordic,access = <NRF_OWNER_ID_APPLICATION NRF_PERM_RW>;
164+
zephyr,memory-region = "DMA_RAM3x_APP";
165+
zephyr,memory-attr = <( DT_MEM_DMA )>;
166+
};
180167

181-
cpurad_dma_region: memory@1000 {
182-
compatible = "nordic,owned-memory", "zephyr,memory-region";
183-
reg = <0x1000 DT_SIZE_K(1)>;
184-
status = "disabled";
185-
#memory-region-cells = <0>;
186-
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
187-
zephyr,memory-region = "DMA_RAM3x_RAD";
188-
zephyr,memory-attr = <( DT_MEM_DMA )>;
189-
};
168+
cpurad_dma_region: memory@2fc07000 {
169+
compatible = "nordic,owned-memory", "zephyr,memory-region";
170+
reg = <0x2fc07000 DT_SIZE_K(1)>;
171+
status = "disabled";
172+
#memory-region-cells = <0>;
173+
nordic,access = <NRF_OWNER_ID_RADIOCORE NRF_PERM_RW>;
174+
zephyr,memory-region = "DMA_RAM3x_RAD";
175+
zephyr,memory-attr = <( DT_MEM_DMA )>;
190176
};
191177
};
192178
};

‎tests/drivers/spi/spi_error_cases/boards/nrf54h20dk_nrf54h20_cpuppr_launcher.overlay‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,6 @@
1414
interrupt-parent = <&cpuppr_clic>;
1515
};
1616

17-
&shared_ram3x_region {
18-
status = "okay";
19-
};
20-
2117
&gpio0 {
2218
status = "reserved";
2319
};

0 commit comments

Comments
 (0)