Skip to content

Commit 2ac2275

Browse files
dhsu-nordicrlubos
authored andcommitted
[nrf fromtree] dts: vendor: nordic: nrf7120: Add Wi-Fi WICR nodes
Add the WICR node. The node is disabled by default; boards that boot the Wi-Fi core should enable it and populate the WICR properties. Add Wi-Fi LMAC and UMAC ROM regions. These provide the boot addresses used by the WICR. Add temporary Wi-Fi LMAC and UMAC patch partitions at the current FPGA/bring-up addresses used by the patch binaries. These partitions provide the ROM patch addresses used when generating WICR. The placement is expected to be revisited when the Wi-Fi patch partition and DFU architecture is finalized. Signed-off-by: Dhanoo Surasarang <dhanoo.surasarang@nordicsemi.no> (cherry picked from commit 8b66ac6c5d0eb5fc44a80cab3c679fb0e00e0298)
1 parent 532efea commit 2ac2275

3 files changed

Lines changed: 56 additions & 5 deletions

File tree

dts/vendor/nordic/nrf7120_cpuapp_ns_partition.dtsi

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,5 +92,23 @@
9292
label = "storage";
9393
reg = <0x00015d000 DT_SIZE_K(32)>;
9494
};
95+
96+
/*
97+
* Reserved for Wi-Fi LMAC ROM patch.
98+
* Temporary FPGA/bring-up placement.
99+
*/
100+
wifi_lmac_patch_partition: partition@2e0000 {
101+
compatible = "zephyr,mapped-partition";
102+
reg = <0x002e0000 DT_SIZE_K(4)>;
103+
};
104+
105+
/*
106+
* Reserved for Wi-Fi UMAC ROM patch.
107+
* Temporary FPGA/bring-up placement.
108+
*/
109+
wifi_umac_patch_partition: partition@2f0000 {
110+
compatible = "zephyr,mapped-partition";
111+
reg = <0x002f0000 DT_SIZE_K(4)>;
112+
};
95113
};
96114
};

dts/vendor/nordic/nrf7120_cpuapp_partition.dtsi

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,37 @@
2222
slot0_partition: partition@10000 {
2323
compatible = "zephyr,mapped-partition";
2424
label = "image-0";
25-
reg = <0x00010000 DT_SIZE_K(1988)>;
25+
reg = <0x00010000 DT_SIZE_K(1440)>;
2626
};
2727

28-
slot1_partition: partition@201000 {
28+
slot1_partition: partition@178000 {
2929
compatible = "zephyr,mapped-partition";
3030
label = "image-1";
31-
reg = <0x00201000 DT_SIZE_K(1988)>;
31+
reg = <0x00178000 DT_SIZE_K(1440)>;
3232
};
3333

34-
storage_partition: partition@3f2000 {
34+
/*
35+
* Reserved for Wi-Fi LMAC ROM patch.
36+
* Temporary FPGA/bring-up placement.
37+
*/
38+
wifi_lmac_patch_partition: partition@2e0000 {
39+
compatible = "zephyr,mapped-partition";
40+
reg = <0x002e0000 DT_SIZE_K(4)>;
41+
};
42+
43+
/*
44+
* Reserved for Wi-Fi UMAC ROM patch.
45+
* Temporary FPGA/bring-up placement.
46+
*/
47+
wifi_umac_patch_partition: partition@2f0000 {
48+
compatible = "zephyr,mapped-partition";
49+
reg = <0x002f0000 DT_SIZE_K(4)>;
50+
};
51+
52+
storage_partition: partition@300000 {
3553
compatible = "zephyr,mapped-partition";
3654
label = "storage";
37-
reg = <0x003f2000 DT_SIZE_K(36)>;
55+
reg = <0x00300000 DT_SIZE_K(36)>;
3856
};
3957
};
4058
};

dts/vendor/nordic/nrf7120_enga.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,12 @@
125125
#address-cells = <1>;
126126
#size-cells = <1>;
127127

128+
wicr: wicr@3fd000 {
129+
compatible = "nordic,nrf-wicr";
130+
reg = <0x3fd000 0x1000>;
131+
status = "disabled";
132+
};
133+
128134
ficr: ficr@ffc000 {
129135
compatible = "nordic,nrf-ficr";
130136
reg = <0xffc000 0x1000>;
@@ -175,6 +181,15 @@
175181
ranges = <0x0 0x200e0000 0x1e000>;
176182
};
177183

184+
/* Wi-Fi ROM regions */
185+
wifi_lmac_rom: memory@28080000 {
186+
reg = <0x28080000 DT_SIZE_K(320)>;
187+
};
188+
189+
wifi_umac_rom: memory@28180000 {
190+
reg = <0x28180000 DT_SIZE_K(512)>;
191+
};
192+
178193
#ifdef USE_NON_SECURE_ADDRESS_MAP
179194
global_peripherals: peripheral@40000000 {
180195
reg = <0x40000000 0x10000000>;

0 commit comments

Comments
 (0)