Skip to content

Commit dda74b9

Browse files
jonathannilsenhakonfam
authored andcommitted
[nrf fromlist] dts: nordic: update UICR definition on nrf54h20
Upstream PR #: 91826 With IronSide SE there is only one defined UICR which is at the location of the APPLICATION UICR. Update the devicetree definition accordingly, and use the "nordic,nrf-uicr" compatible on the node since the domain distinction added by the v2 compatible is no longer relevant. Signed-off-by: Jonathan Nilsen <[email protected]> (cherry picked from commit 7173111bd1d331783d4baae868919ed1c968b051)
1 parent 66ba5fb commit dda74b9

File tree

2 files changed

+6
-9
lines changed

2 files changed

+6
-9
lines changed

dts/vendor/nordic/nrf54h20.dtsi

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -225,26 +225,19 @@
225225
write-block-size = <16>;
226226
};
227227

228-
cpuapp_uicr: uicr@fff8000 {
229-
compatible = "nordic,nrf-uicr-v2";
228+
uicr: uicr@fff8000 {
229+
compatible = "nordic,nrf-uicr";
230230
reg = <0xfff8000 DT_SIZE_K(2)>;
231231
#address-cells = <1>;
232232
#size-cells = <1>;
233233
ranges = <0x0 0xfff8000 DT_SIZE_K(2)>;
234-
domain = <2>;
235234

236235
bicr: bicr@7b0 {
237236
compatible = "nordic,nrf-bicr";
238237
reg = <0x7b0 48>;
239238
};
240239
};
241240

242-
cpurad_uicr: uicr@fffa000 {
243-
compatible = "nordic,nrf-uicr-v2";
244-
reg = <0xfffa000 DT_SIZE_K(2)>;
245-
domain = <3>;
246-
};
247-
248241
ficr: ficr@fffe000 {
249242
compatible = "nordic,nrf-ficr";
250243
reg = <0xfffe000 DT_SIZE_K(2)>;

soc/nordic/validate_base_addresses.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,11 @@ CHECK_DT_REG(uart134, NRF_UARTE134);
335335
CHECK_DT_REG(uart135, NRF_UARTE135);
336336
CHECK_DT_REG(uart136, NRF_UARTE136);
337337
CHECK_DT_REG(uart137, NRF_UARTE137);
338+
#if !defined(CONFIG_SOC_SERIES_NRF54HX)
338339
CHECK_DT_REG(uicr, NRF_UICR);
340+
#else
341+
CHECK_DT_REG(uicr, NRF_APPLICATION_UICR);
342+
#endif
339343
CHECK_DT_REG(cpuapp_uicr, NRF_APPLICATION_UICR);
340344
CHECK_DT_REG(bicr, NRF_APPLICATION_BICR);
341345
CHECK_DT_REG(cpurad_uicr, NRF_RADIOCORE_UICR);

0 commit comments

Comments
 (0)