dts: stm32h745: Define M4 flash controller

erwango · carlescufi · commit 5bc01c3614fa · 2020-12-14T16:47:05.000+01:00
Define erase and write block size for M4 side flash controller.
Additionally move compatible definition from package to soc file.

Signed-off-by: Erwan Gouriou &lt;erwan.gouriou@linaro.org&gt;
diff --git a/dts/arm/st/h7/stm32h745.dtsi b/dts/arm/st/h7/stm32h745.dtsi
@@ -10,6 +10,12 @@
 	soc {
 		flash-controller@52002000 {
 			flash0: flash@8000000 {
+				compatible = "soc-nv-flash";
+				write-block-size = <32>;
+				erase-block-size = <DT_SIZE_K(128)>;
+			};
+			flash1: flash@8100000 {
+				compatible = "soc-nv-flash";
 				write-block-size = <32>;
 				erase-block-size = <DT_SIZE_K(128)>;
 			};
diff --git a/dts/arm/st/h7/stm32h745Xi_m4.dtsi b/dts/arm/st/h7/stm32h745Xi_m4.dtsi
@@ -7,6 +7,8 @@
 #include <mem.h>
 #include <st/h7/stm32h745.dtsi>
 
+/delete-node/ &flash0;
+
 / {
 	cpus {
 		/delete-node/ cpu@0;
@@ -15,7 +17,6 @@
 	soc {
 		flash-controller@52002000 {
 			flash1: flash@8100000 {
-				compatible = "soc-nv-flash";
 				label = "FLASH_STM32";
 				reg = <0x08100000 DT_SIZE_K(1024)>;
 			};
diff --git a/dts/arm/st/h7/stm32h745Xi_m7.dtsi b/dts/arm/st/h7/stm32h745Xi_m7.dtsi
@@ -7,6 +7,8 @@
 #include <mem.h>
 #include <st/h7/stm32h745.dtsi>
 
+/delete-node/ &flash1;
+
 / {
 	cpus {
 		/delete-node/ cpu@1;
@@ -20,7 +22,6 @@
 	soc {
 		flash-controller@52002000 {
 			flash0: flash@8000000 {
-				compatible = "soc-nv-flash";
 				label = "FLASH_STM32";
 				reg = <0x08000000 DT_SIZE_K(1024)>;
 			};
diff --git a/dts/arm/st/h7/stm32h747Xi_m4.dtsi b/dts/arm/st/h7/stm32h747Xi_m4.dtsi
@@ -7,6 +7,8 @@
 #include <mem.h>
 #include <st/h7/stm32h747.dtsi>
 
+/delete-node/ &flash0;
+
 / {
 	cpus {
 		/delete-node/ cpu@0;
@@ -15,7 +17,6 @@
 	soc {
 		flash-controller@52002000 {
 			flash1: flash@8100000 {
-				compatible = "soc-nv-flash";
 				label = "FLASH_STM32";
 				reg = <0x08100000 DT_SIZE_K(1024)>;
 			};
diff --git a/dts/arm/st/h7/stm32h747Xi_m7.dtsi b/dts/arm/st/h7/stm32h747Xi_m7.dtsi
@@ -7,6 +7,8 @@
 #include <mem.h>
 #include <st/h7/stm32h747.dtsi>
 
+/delete-node/ &flash1;
+
 / {
 	cpus {
 		/delete-node/ cpu@1;
@@ -15,7 +17,6 @@
 	soc {
 		flash-controller@52002000 {
 			flash0: flash@8000000 {
-				compatible = "soc-nv-flash";
 				label = "FLASH_STM32";
 				reg = <0x08000000 DT_SIZE_K(1024)>;
 			};
