Merge pull request #5 from outpost-os/fix-h7

h7: fixing dtsi to stay generic, removing zephyr-related
outpost-os · Jan 14, 2025 · ee17a5b · ee17a5b
2 parents 4612272 + fe73d9b
commit ee17a5b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 25 deletions.
diff --git a/dts/manufacturer/st/h7/stm32h7.dtsi b/dts/manufacturer/st/h7/stm32h7.dtsi
@@ -22,10 +22,6 @@
 #include <freq.h>
 
 / {
-	chosen {
-		zephyr,entropy = &rng;
-		zephyr,flash-controller = &flash;
-	};
 
 	cpus {
 		#address-cells = <1>;
@@ -47,10 +43,8 @@
 	};
 
 	quadspi_memory: memory@90000000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
+		compatible = "mmio-sram";
 		reg = <0x90000000 DT_SIZE_M(256)>;
-		zephyr,memory-region = "QSPI";
-		zephyr,memory-attr = <( DT_MEM_ARM(ATTR_MPU_EXTMEM) )>;
 	};
 
 	clocks {
@@ -99,7 +93,7 @@
 			status = "disabled";
 		};
 
-		pll: pll@0 {
+		pll1: pll@0 {
 			#clock-cells = <0>;
 			compatible = "st,stm32h7-pll-clock";
 			reg = <0>;
@@ -149,6 +143,11 @@
 			};
 		};
 
+        syscfg: system-config@58000400 {
+            compatible = "st,stm32h7-syscfg", "syscon";
+            reg = <0x58000400 0x400>;
+        };
+
 		exti: interrupt-controller@58000000 {
 			compatible = "st,stm32-exti";
 			interrupt-controller;
@@ -999,10 +998,9 @@
 		};
 
 		backup_sram: memory@38800000 {
-			compatible = "zephyr,memory-region", "st,stm32-backup-sram";
+			compatible = "st,stm32-backup-sram";
 			reg = <0x38800000 DT_SIZE_K(4)>;
 			clocks = <&rcc STM32_CLOCK_BUS_AHB4 0x10000000>;
-			zephyr,memory-region = "BACKUP_SRAM";
 			status = "disabled";
 		};
 

diff --git a/dts/manufacturer/st/h7/stm32h743.dtsi b/dts/manufacturer/st/h7/stm32h743.dtsi
@@ -70,35 +70,30 @@
 	/* System data RAM accessible over AHB bus: SRAM1 in D2 domain */
 	sram1: memory@30000000 {
 		reg = <0x30000000 DT_SIZE_K(128)>;
-		compatible = "zephyr,memory-region", "mmio-sram";
-		zephyr,memory-region = "SRAM1";
+		compatible = "mmio-sram";
 	};
 
 	/* System data RAM accessible over AHB bus: SRAM2 in D2 domain */
 	sram2: memory@30020000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
+		compatible = "mmio-sram";
 		reg = <0x30020000 DT_SIZE_K(128)>;
-		zephyr,memory-region = "SRAM2";
 	};
 
 	/* System data RAM accessible over AHB bus: SRAM3 in D2 domain */
 	sram3: memory@30040000 {
-		compatible = "zephyr,memory-region", "mmio-sram";
+		compatible = "mmio-sram";
 		reg = <0x30040000 DT_SIZE_K(32)>;
-		zephyr,memory-region = "SRAM3";
 	};
 
 	/* System data RAM accessible over AHB bus: SRAM4 in D3 domain  */
 	sram4: memory@38000000 {
 		reg = <0x38000000 DT_SIZE_K(64)>;
-		compatible = "zephyr,memory-region", "mmio-sram";
-		zephyr,memory-region = "SRAM4";
+		compatible = "mmio-sram";
 	};
 
 	dtcm: memory@20000000 {
-		compatible = "zephyr,memory-region", "arm,dtcm";
+		compatible = "arm,dtcm";
 		reg = <0x20000000 DT_SIZE_K(128)>;
-		zephyr,memory-region = "DTCM";
 	};
 
 	otghs_fs_phy: otghs_fs_phy {

diff --git a/include/dt-bindings/memory-attr/memory-attr-arm.h b/include/dt-bindings/memory-attr/memory-attr-arm.h
@@ -6,9 +6,6 @@
 #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_ARM_H_
 #define ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_ARM_H_
 
-#include <zephyr/sys/util_macro.h>
-#include <zephyr/dt-bindings/memory-attr/memory-attr.h>
-
 /*
  * Architecture specific ARM MPU related attributes.
  *

diff --git a/include/dt-bindings/memory-attr/memory-attr.h b/include/dt-bindings/memory-attr/memory-attr.h
@@ -6,8 +6,6 @@
 #ifndef ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_H_
 #define ZEPHYR_INCLUDE_DT_BINDINGS_MEM_ATTR_H_
 
-#include <zephyr/sys/util_macro.h>
-
 /*
  * Generic memory attributes.
  *