[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]>

Author: jonathannilsen

dts/vendor/nordic/nrf54h20.dtsi

@@ -223,26 +223,19 @@
 			write-block-size = <16>;
 		};
 
-		cpuapp_uicr: uicr@fff8000 {
-			compatible = "nordic,nrf-uicr-v2";
+		uicr: uicr@fff8000 {
+			compatible = "nordic,nrf-uicr";
 			reg = <0xfff8000 DT_SIZE_K(2)>;
 			#address-cells = <1>;
 			#size-cells = <1>;
 			ranges = <0x0 0xfff8000 DT_SIZE_K(2)>;
-			domain = <2>;
 
 			bicr: bicr@7b0 {
 				compatible = "nordic,nrf-bicr";
 				reg = <0x7b0 48>;
 			};
 		};
 
-		cpurad_uicr: uicr@fffa000 {
-			compatible = "nordic,nrf-uicr-v2";
-			reg = <0xfffa000 DT_SIZE_K(2)>;
-			domain = <3>;
-		};
-
 		ficr: ficr@fffe000 {
 			compatible = "nordic,nrf-ficr";
 			reg = <0xfffe000 DT_SIZE_K(2)>;

soc/nordic/validate_base_addresses.c

@@ -333,7 +333,11 @@ CHECK_DT_REG(uart134, NRF_UARTE134);
 CHECK_DT_REG(uart135, NRF_UARTE135);
 CHECK_DT_REG(uart136, NRF_UARTE136);
 CHECK_DT_REG(uart137, NRF_UARTE137);
+#if !defined(CONFIG_SOC_SERIES_NRF54HX)
 CHECK_DT_REG(uicr, NRF_UICR);
+#else
+CHECK_DT_REG(uicr, NRF_APPLICATION_UICR);
+#endif
 CHECK_DT_REG(cpuapp_uicr, NRF_APPLICATION_UICR);
 CHECK_DT_REG(bicr, NRF_APPLICATION_BICR);
 CHECK_DT_REG(cpurad_uicr, NRF_RADIOCORE_UICR);