dts: common: nordic: nrf5340: Use sub-paritions for TF-M areas

Uses sub-partitions to allow having a dedicated secure and
non-secure partition area in flash partitions, which also allows
the main application slot to be extended when TF-M is not in use

Signed-off-by: Jamie McCrae <[email protected]>

Author: nordicjm

dts/vendor/nordic/nrf5340_cpuapp_partition.dtsi

@@ -35,23 +35,41 @@
 		};
 
 		slot0_partition: partition@10000 {
+			compatible = "fixed-subpartitions";
 			label = "image-0";
-			reg = <0x00010000 0x40000>;
-		};
-
-		slot0_ns_partition: partition@50000 {
-			label = "image-0-nonsecure";
-			reg = <0x00050000 0x30000>;
+			reg = <0x00010000 0x70000>;
+			ranges = <0x0 0x10000 0x70000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			slot0_s_partition: partition@0 {
+				label = "image-0-secure";
+				reg = <0x00000000 0x40000>;
+			};
+
+			slot0_ns_partition: partition@40000 {
+				label = "image-0-nonsecure";
+				reg = <0x00040000 0x30000>;
+			};
 		};
 
 		slot1_partition: partition@80000 {
+			compatible = "fixed-subpartitions";
 			label = "image-1";
-			reg = <0x00080000 0x40000>;
-		};
-
-		slot1_ns_partition: partition@c0000 {
-			label = "image-1-nonsecure";
-			reg = <0x000c0000 0x30000>;
+			reg = <0x00080000 0x70000>;
+			ranges = <0x0 0x80000 0x70000>;
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			slot1_s_partition: partition@0 {
+				label = "image-1-secure";
+				reg = <0x00000000 0x40000>;
+			};
+
+			slot1_ns_partition: partition@40000 {
+				label = "image-1-nonsecure";
+				reg = <0x00040000 0x30000>;
+			};
 		};
 
 		tfm_ps_partition: partition@f0000 {