[PATCH 2/3] ARM: dts: Refactor aspeed-ast2500-evb.dts into a dtsi

Rick Altherr raltherr at google.com
Thu Jun 30 04:00:42 AEST 2016


Booting a normal image on the AST2500 EVB doesn't require a flash
layout but OpenBMC does.  Move the contents of the EVB dts into a dtsi
so it can be extended in an OpenBMC-specific dts.

Signed-off-by: Rick Altherr <raltherr at google.com>
---
 arch/arm/boot/dts/aspeed-ast2500-evb.dts  | 103 +-----------------------------
 arch/arm/boot/dts/aspeed-ast2500-evb.dtsi | 102 +++++++++++++++++++++++++++++
 2 files changed, 103 insertions(+), 102 deletions(-)
 create mode 100644 arch/arm/boot/dts/aspeed-ast2500-evb.dtsi

diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
index a80a6b9..f08b552 100644
--- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -1,104 +1,3 @@
 /dts-v1/;
 
-#include "aspeed-g5.dtsi"
-
-/ {
-	model = "AST2500 EVB";
-	compatible = "aspeed,ast2500-evb", "aspeed,ast2500";
-
-	aliases {
-		serial4 = &uart5;
-	};
-
-	chosen {
-		stdout-path = &uart5;
-		bootargs = "console=ttyS4,115200 earlyprintk";
-	};
-
-	memory {
-		reg = <0x80000000 0x20000000>;
-	};
-
-	ahb {
-		bmc_pnor: fmc at 1e620000 {
-			reg = < 0x1e620000 0x94
-				0x20000000 0x02000000 >;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			compatible = "aspeed,fmc";
-			flash at 0 {
-				reg = < 0 >;
-				compatible = "jedec,spi-nor" ;
-			};
-		};
-	};
-};
-
-&uart5 {
-	status = "okay";
-};
-
-&mac0 {
-	status = "okay";
-};
-
-&i2c0 {
-	status = "okay";
-};
-
-&i2c1 {
-	status = "okay";
-};
-
-&i2c2 {
-	status = "okay";
-};
-
-&i2c3 {
-	status = "okay";
-};
-
-&i2c4 {
-	status = "okay";
-};
-
-&i2c5 {
-	status = "okay";
-
-//	eeprom at 50 {
-//		compatible = "atmel,24c08";
-//		reg = <0xa0>;
-//	};
-};
-
-&i2c6 {
-	status = "okay";
-};
-
-&i2c7 {
-	status = "okay";
-};
-
-&i2c8 {
-	status = "okay";
-};
-
-&i2c9 {
-	status = "okay";
-};
-
-&i2c10 {
-	status = "okay";
-};
-
-&i2c11 {
-	status = "okay";
-};
-
-&i2c12 {
-	status = "okay";
-};
-
-&i2c13 {
-	status = "okay";
-};
+#include "aspeed-ast2500-evb.dtsi"
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dtsi b/arch/arm/boot/dts/aspeed-ast2500-evb.dtsi
new file mode 100644
index 0000000..6cc4932
--- /dev/null
+++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dtsi
@@ -0,0 +1,102 @@
+#include "aspeed-g5.dtsi"
+
+/ {
+	model = "AST2500 EVB";
+	compatible = "aspeed,ast2500-evb", "aspeed,ast2500";
+
+	aliases {
+		serial4 = &uart5;
+	};
+
+	chosen {
+		stdout-path = &uart5;
+		bootargs = "console=ttyS4,115200 earlyprintk";
+	};
+
+	memory {
+		reg = <0x80000000 0x20000000>;
+	};
+
+	ahb {
+		bmc_pnor: fmc at 1e620000 {
+			reg = < 0x1e620000 0x94
+				0x20000000 0x02000000 >;
+			#address-cells = <1>;
+			#size-cells = <0>;
+			compatible = "aspeed,fmc";
+			flash at 0 {
+				reg = < 0 >;
+				compatible = "jedec,spi-nor" ;
+			};
+		};
+	};
+};
+
+&uart5 {
+	status = "okay";
+};
+
+&mac0 {
+	status = "okay";
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&i2c2 {
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
+
+&i2c4 {
+	status = "okay";
+};
+
+&i2c5 {
+	status = "okay";
+
+//	eeprom at 50 {
+//		compatible = "atmel,24c08";
+//		reg = <0xa0>;
+//	};
+};
+
+&i2c6 {
+	status = "okay";
+};
+
+&i2c7 {
+	status = "okay";
+};
+
+&i2c8 {
+	status = "okay";
+};
+
+&i2c9 {
+	status = "okay";
+};
+
+&i2c10 {
+	status = "okay";
+};
+
+&i2c11 {
+	status = "okay";
+};
+
+&i2c12 {
+	status = "okay";
+};
+
+&i2c13 {
+	status = "okay";
+};
-- 
2.8.0.rc3.226.g39d4020



More information about the openbmc mailing list