[PATCH v5 15/28] arm: dts: ls1028a: move the iRC node and its devices into /soc

Michael Walle michael at walle.cc
Wed Oct 13 18:14:14 CEST 2021


While inserting them into the new location, keep them sorted by the
register base offset just like in the linux kernel device tree.

While at it fix the indentation.

Signed-off-by: Michael Walle <michael at walle.cc>
Reviewed-by: Vladimir Oltean <vladimir.oltean at nxp.com>
---
 arch/arm/dts/fsl-ls1028a.dtsi | 202 +++++++++++++++++-----------------
 1 file changed, 103 insertions(+), 99 deletions(-)

diff --git a/arch/arm/dts/fsl-ls1028a.dtsi b/arch/arm/dts/fsl-ls1028a.dtsi
index c289009ca1..ca593c7218 100644
--- a/arch/arm/dts/fsl-ls1028a.dtsi
+++ b/arch/arm/dts/fsl-ls1028a.dtsi
@@ -43,105 +43,6 @@
 					  IRQ_TYPE_LEVEL_LOW)>;
 	};
 
-	pcie at 1f0000000 {
-		compatible = "pci-host-ecam-generic";
-		/* ECAM bus 0, HW has more space reserved but not populated */
-		bus-range = <0x0 0x0>;
-		reg = <0x01 0xf0000000 0x0 0x100000>;
-		#address-cells = <3>;
-		#size-cells = <2>;
-		device_type = "pci";
-		ranges= <0x82000000 0x0 0x00000000 0x1 0xf8000000 0x0 0x160000>;
-		enetc0: pci at 0,0 {
-			reg = <0x000000 0 0 0 0>;
-			status = "disabled";
-		};
-		enetc1: pci at 0,1 {
-			reg = <0x000100 0 0 0 0>;
-			status = "disabled";
-		};
-		enetc2: pci at 0,2 {
-			reg = <0x000200 0 0 0 0>;
-			status = "disabled";
-			phy-mode = "internal";
-
-			fixed-link {
-				speed = <2500>;
-				full-duplex;
-			};
-		};
-		mdio0: pci at 0,3 {
-			#address-cells=<0>;
-			#size-cells=<1>;
-			reg = <0x000300 0 0 0 0>;
-			status = "disabled";
-
-			fixed-link {
-				speed = <1000>;
-				full-duplex;
-			};
-		};
-
-		mscc_felix: pci at 0,5 {
-			reg = <0x000500 0 0 0 0>;
-			status = "disabled";
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				mscc_felix_port0: port at 0 {
-					reg = <0>;
-					status = "disabled";
-				};
-
-				mscc_felix_port1: port at 1 {
-					reg = <1>;
-					status = "disabled";
-				};
-
-				mscc_felix_port2: port at 2 {
-					reg = <2>;
-					status = "disabled";
-				};
-
-				mscc_felix_port3: port at 3 {
-					reg = <3>;
-					status = "disabled";
-				};
-
-				mscc_felix_port4: port at 4 {
-					reg = <4>;
-					phy-mode = "internal";
-					status = "disabled";
-
-					fixed-link {
-						speed = <2500>;
-						full-duplex;
-					};
-				};
-
-				mscc_felix_port5: port at 5 {
-					reg = <5>;
-					phy-mode = "internal";
-					status = "disabled";
-
-					fixed-link {
-						speed = <1000>;
-						full-duplex;
-					};
-
-				};
-			};
-		};
-
-		enetc6: pci at 0,6 {
-			reg = <0x000600 0 0 0 0>;
-			status = "disabled";
-			phy-mode = "internal";
-		};
-	};
-
 	soc: soc {
 		compatible = "simple-bus";
 		#address-cells = <2>;
@@ -484,5 +385,108 @@
 			compatible = "arm,sp805-wdt";
 			reg = <0x0 0xc000000 0x0 0x1000>;
 		};
+
+		pcie at 1f0000000 {
+			compatible = "pci-host-ecam-generic";
+			/* ECAM bus 0, HW has more space reserved but not populated */
+			bus-range = <0x0 0x0>;
+			reg = <0x01 0xf0000000 0x0 0x100000>;
+			#address-cells = <3>;
+			#size-cells = <2>;
+			device_type = "pci";
+			ranges = <0x82000000 0x0 0x00000000 0x1 0xf8000000 0x0 0x160000>;
+
+			enetc0: pci at 0,0 {
+				reg = <0x000000 0 0 0 0>;
+				status = "disabled";
+			};
+
+			enetc1: pci at 0,1 {
+				reg = <0x000100 0 0 0 0>;
+				status = "disabled";
+			};
+
+			enetc2: pci at 0,2 {
+				reg = <0x000200 0 0 0 0>;
+				status = "disabled";
+				phy-mode = "internal";
+
+				fixed-link {
+					speed = <2500>;
+					full-duplex;
+				};
+			};
+
+			mdio0: pci at 0,3 {
+				#address-cells=<0>;
+				#size-cells=<1>;
+				reg = <0x000300 0 0 0 0>;
+				status = "disabled";
+
+				fixed-link {
+					speed = <1000>;
+					full-duplex;
+				};
+			};
+
+			mscc_felix: pci at 0,5 {
+				reg = <0x000500 0 0 0 0>;
+				status = "disabled";
+
+				ports {
+					#address-cells = <1>;
+					#size-cells = <0>;
+
+					mscc_felix_port0: port at 0 {
+						reg = <0>;
+						status = "disabled";
+					};
+
+					mscc_felix_port1: port at 1 {
+						reg = <1>;
+						status = "disabled";
+					};
+
+					mscc_felix_port2: port at 2 {
+						reg = <2>;
+						status = "disabled";
+					};
+
+					mscc_felix_port3: port at 3 {
+						reg = <3>;
+						status = "disabled";
+					};
+
+					mscc_felix_port4: port at 4 {
+						reg = <4>;
+						phy-mode = "internal";
+						status = "disabled";
+
+						fixed-link {
+							speed = <2500>;
+							full-duplex;
+						};
+					};
+
+					mscc_felix_port5: port at 5 {
+						reg = <5>;
+						phy-mode = "internal";
+						status = "disabled";
+
+						fixed-link {
+							speed = <1000>;
+							full-duplex;
+						};
+
+					};
+				};
+			};
+
+			enetc6: pci at 0,6 {
+				reg = <0x000600 0 0 0 0>;
+				status = "disabled";
+				phy-mode = "internal";
+			};
+		};
 	};
 };
-- 
2.30.2



More information about the U-Boot mailing list