Skip to contentSkip to conversation

arm64: dts: socfpga: agilex/stratix10: move base_fpga_region out of soc node

PATCH New Dinh Nguyen 1 participant 2 messages Sep 29, 2023

Subsystems (2)
lore
Share & tools
lore

Dinh Nguyen

author maintainer
#0 lore raw

PATCH 1/2 arm64: dts: socfpga: agilex/stratix10: move base_fpga_region out of soc node

The soc node is supposed to only have device nodes with MMIO addresses, thus move the base_fpga_region outside of the soc node.

soc: base_fpga_region: {'#address-cells': [[2]], '#size-cells': [[2]], 'compatible': ['fpga-region'], 'fpga-mgr': [[6]]} should not be valid under {'type': 'object'}

---
 arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 14 +++++++-------
 arch/arm64/boot/dts/intel/socfpga_agilex.dtsi     | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)
arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +7 -7
index 439497ab967d..4ad4cee83370 100644
@@ -125,6 +125,13 @@ qspi_clk: qspi-clk {
 		};
 	};
 
+	base_fpga_region {
+		#address-cells = <0x2>;
+		#size-cells = <0x2>;
+		compatible = "fpga-region";
+		fpga-mgr = <&fpga_mgr>;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -133,13 +140,6 @@ soc {
 		interrupt-parent = <&intc>;
 		ranges = <0 0 0 0xffffffff>;
 
-		base_fpga_region {
-			#address-cells = <0x2>;
-			#size-cells = <0x2>;
-			compatible = "fpga-region";
-			fpga-mgr = <&fpga_mgr>;
-		};
-
 		clkmgr: clock-controller@ffd10000 {
 			compatible = "intel,stratix10-clkmgr";
 			reg = <0xffd10000 0x1000>;
arch/arm64/boot/dts/intel/socfpga_agilex.dtsi +7 -7
index d3adb6a130ae..109bd4c35c3b 100644
@@ -130,6 +130,13 @@ usbphy0: usbphy {
 		compatible = "usb-nop-xceiv";
 	};
 
+	base_fpga_region {
+		#address-cells = <0x2>;
+		#size-cells = <0x2>;
+		compatible = "fpga-region";
+		fpga-mgr = <&fpga_mgr>;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -138,13 +145,6 @@ soc {
 		interrupt-parent = <&intc>;
 		ranges = <0 0 0 0xffffffff>;
 
-		base_fpga_region {
-			#address-cells = <0x2>;
-			#size-cells = <0x2>;
-			compatible = "fpga-region";
-			fpga-mgr = <&fpga_mgr>;
-		};
-
 		clkmgr: clock-controller@ffd10000 {
 			compatible = "intel,agilex-clkmgr";
 			reg = <0xffd10000 0x1000>;
Signature · 1 line
2.42.0
author maintainer
#1 lore raw

PATCH 2/2 ARM: dts: socfpga: move base_fpga_region out of soc node

The soc node is supposed to only have device nodes with MMIO addresses, thus move the base_fpga_region outside of the soc node.

soc: base_fpga_region: {'#address-cells': [[2]], '#size-cells': [[2]], 'compatible': ['fpga-region'], 'fpga-mgr': [[6]]} should not be valid under {'type': 'object'}

---
 arch/arm/boot/dts/intel/socfpga/socfpga.dtsi     | 16 ++++++++--------
 .../boot/dts/intel/socfpga/socfpga_arria10.dtsi  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)
arch/arm/boot/dts/intel/socfpga/socfpga.dtsi +8 -8
index 4c1d140f40f8..db6aa372b868 100644
@@ -54,6 +54,14 @@ intc: interrupt-controller@fffed000 {
 		      <0xfffec100 0x100>;
 	};
 
+	base_fpga_region {
+		compatible = "fpga-region";
+		fpga-mgr = <&fpgamgr0>;
+
+		#address-cells = <0x1>;
+		#size-cells = <0x1>;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -87,14 +95,6 @@ pdma: pdma@ffe01000 {
 			};
 		};
 
-		base_fpga_region {
-			compatible = "fpga-region";
-			fpga-mgr = <&fpgamgr0>;
-
-			#address-cells = <0x1>;
-			#size-cells = <0x1>;
-		};
-
 		can0: can@ffc00000 {
 			compatible = "bosch,d_can";
 			reg = <0xffc00000 0x1000>;
arch/arm/boot/dts/intel/socfpga/socfpga_arria10.dtsi +8 -8
index f36063c57c7f..dbba8b2533c3 100644
@@ -46,6 +46,14 @@ intc: interrupt-controller@ffffd000 {
 		      <0xffffc100 0x100>;
 	};
 
+	base_fpga_region {
+		#address-cells = <0x1>;
+		#size-cells = <0x1>;
+
+		compatible = "fpga-region";
+		fpga-mgr = <&fpga_mgr>;
+	};
+
 	soc {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -80,14 +88,6 @@ pdma: pdma@ffda1000 {
 			};
 		};
 
-		base_fpga_region {
-			#address-cells = <0x1>;
-			#size-cells = <0x1>;
-
-			compatible = "fpga-region";
-			fpga-mgr = <&fpga_mgr>;
-		};
-
 		clkmgr@ffd04000 {
 				compatible = "altr,clk-mgr";
 				reg = <0xffd04000 0x1000>;
Signature · 1 line
2.42.0