Revert "[nrf fromlist] dts: nordic: update UICR definition on nrf54h20"

This reverts commit c56fad6.

Signed-off-by: Jonathan Nilsen <[email protected]>

Author: jonathannilsen

dts/vendor/nordic/nrf54h20.dtsi

@@ -226,19 +226,26 @@
 			write-block-size = <16>;
 		};
 
-		uicr: uicr@fff8000 {
-			compatible = "nordic,nrf-uicr";
+		cpuapp_uicr: uicr@fff8000 {
+			compatible = "nordic,nrf-uicr-v2";
 			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

@@ -335,11 +335,7 @@ 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);