Skip to content

Commit f8c811c

Browse files
jonathannilsen57300
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 794b3c5 commit f8c811c

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
@@ -222,26 +222,19 @@
222222
write-block-size = <16>;
223223
};
224224

225-
cpuapp_uicr: uicr@fff8000 {
226-
compatible = "nordic,nrf-uicr-v2";
225+
uicr: uicr@fff8000 {
226+
compatible = "nordic,nrf-uicr";
227227
reg = <0xfff8000 DT_SIZE_K(2)>;
228228
#address-cells = <1>;
229229
#size-cells = <1>;
230230
ranges = <0x0 0xfff8000 DT_SIZE_K(2)>;
231-
domain = <2>;
232231

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

239-
cpurad_uicr: uicr@fffa000 {
240-
compatible = "nordic,nrf-uicr-v2";
241-
reg = <0xfffa000 DT_SIZE_K(2)>;
242-
domain = <3>;
243-
};
244-
245238
ficr: ficr@fffe000 {
246239
compatible = "nordic,nrf-ficr";
247240
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
@@ -333,7 +333,11 @@ CHECK_DT_REG(uart134, NRF_UARTE134);
333333
CHECK_DT_REG(uart135, NRF_UARTE135);
334334
CHECK_DT_REG(uart136, NRF_UARTE136);
335335
CHECK_DT_REG(uart137, NRF_UARTE137);
336+
#if !defined(CONFIG_SOC_SERIES_NRF54HX)
336337
CHECK_DT_REG(uicr, NRF_UICR);
338+
#else
339+
CHECK_DT_REG(uicr, NRF_APPLICATION_UICR);
340+
#endif
337341
CHECK_DT_REG(cpuapp_uicr, NRF_APPLICATION_UICR);
338342
CHECK_DT_REG(bicr, NRF_APPLICATION_BICR);
339343
CHECK_DT_REG(cpurad_uicr, NRF_RADIOCORE_UICR);

0 commit comments

Comments
 (0)