Revert "powerpc/p1010rdb:update dts to adapt to both old and new p1010rdb"

This reverts commit 63fed6856d1430c72cd9a83dc44150024191f7e0

The above patch did not take p1010rdb_36b.dts into account.

Change-Id: Ie52e9ce778b94d6578dabbed647f67132637be1a
Reviewed-on: http://git.am.freescale.net:8181/5045
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Zang Tiefei-R61911 <tie-fei.zang@freescale.com>
Reviewed-by: Rivera Jose-B46482 <German.Rivera@freescale.com>

4 files changed, 71 insertions, 112 deletions

diff --git a/arch/powerpc/boot/dts/p1010rdb-pa.dts b/arch/powerpc/boot/dts/p1010rdb-pa.dts
deleted file mode 100644
index e1688d4..0000000
--- a/arch/powerpc/boot/dts/p1010rdb-pa.dts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * P1010 RDB-PA Device Tree Source
- *
- * Copyright 2011 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-/include/ "fsl/p1010si-pre.dtsi"
-
-/ {
-	model = "fsl,P1010RDB-PA";
-	compatible = "fsl,P1010RDB";
-
-	/include/ "p1010rdb.dtsi"
-};
-
-&phy0 {
-	interrupts = <3 1 0 0>;
-};
-
-&phy1 {
-	interrupts = <2 1 0 0>;
-};
-
-&phy2 {
-	interrupts = <2 1 0 0>;
-};
-
-/include/ "fsl/p1010si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/p1010rdb-pb.dts b/arch/powerpc/boot/dts/p1010rdb-pb.dts
deleted file mode 100644
index 37f9366..0000000
--- a/arch/powerpc/boot/dts/p1010rdb-pb.dts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * P1010 RDB-PB Device Tree Source
- *
- * Copyright 2011 Freescale Semiconductor Inc.
- *
- * This program is free software; you can redistribute  it and/or modify it
- * under  the terms of  the GNU General  Public License as published by the
- * Free Software Foundation;  either version 2 of the  License, or (at your
- * option) any later version.
- */
-
-/include/ "fsl/p1010si-pre.dtsi"
-
-/ {
-	model = "fsl,P1010RDB-PB";
-	compatible = "fsl,P1010RDB";
-
-	/include/ "p1010rdb.dtsi"
-};
-
-&phy0 {
-	interrupts = <0 1 0 0>;
-};
-
-&phy1 {
-	interrupts = <2 1 0 0>;
-};
-
-&phy2 {
-	interrupts = <1 1 0 0>;
-};
-
-/include/ "fsl/p1010si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/p1010rdb.dts b/arch/powerpc/boot/dts/p1010rdb.dts
new file mode 100644
index 0000000..b868d22
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1010rdb.dts
@@ -0,0 +1,66 @@
+/*
+ * P1010 RDB Device Tree Source
+ *
+ * Copyright 2011 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+/include/ "fsl/p1010si-pre.dtsi"
+
+/ {
+	model = "fsl,P1010RDB";
+	compatible = "fsl,P1010RDB";
+
+	memory {
+		device_type = "memory";
+	};
+
+	board_ifc: ifc: ifc@ffe1e000 {
+		/* NOR, NAND Flashes and CPLD on board */
+		ranges = <0x0 0x0 0x0 0xee000000 0x02000000
+			  0x1 0x0 0x0 0xff800000 0x00010000
+			  0x3 0x0 0x0 0xffb00000 0x00000020>;
+		reg = <0x0 0xffe1e000 0 0x2000>;
+	};
+
+	board_soc: soc: soc@ffe00000 {
+		ranges = <0x0 0x0 0xffe00000 0x100000>;
+	};
+
+	pci0: pcie@ffe09000 {
+		reg = <0 0xffe09000 0 0x1000>;
+		ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
+			  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
+		pcie@0 {
+			ranges = <0x2000000 0x0 0xa0000000
+				  0x2000000 0x0 0xa0000000
+				  0x0 0x20000000
+
+				  0x1000000 0x0 0x0
+				  0x1000000 0x0 0x0
+				  0x0 0x100000>;
+		};
+	};
+
+	pci1: pcie@ffe0a000 {
+		reg = <0 0xffe0a000 0 0x1000>;
+		ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
+			  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
+		pcie@0 {
+			ranges = <0x2000000 0x0 0x80000000
+				  0x2000000 0x0 0x80000000
+				  0x0 0x20000000
+
+				  0x1000000 0x0 0x0
+				  0x1000000 0x0 0x0
+				  0x0 0x100000>;
+		};
+	};
+};
+
+/include/ "p1010rdb.dtsi"
+/include/ "fsl/p1010si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/p1010rdb.dtsi b/arch/powerpc/boot/dts/p1010rdb.dtsi
index 5e5ca56..7fc3402 100644
--- a/arch/powerpc/boot/dts/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/p1010rdb.dtsi
@@ -32,17 +32,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-memory {
-	device_type = "memory";
-};
-
-board_ifc: ifc: ifc@ffe1e000 {
-	/* NOR, NAND Flashes and CPLD on board */
-	ranges = <0x0 0x0 0x0 0xee000000 0x02000000
-		  0x1 0x0 0x0 0xff800000 0x00010000
-		  0x3 0x0 0x0 0xffb00000 0x00000020>;
-	reg = <0x0 0xffe1e000 0 0x2000>;
-
+&board_ifc {
 	nor@0,0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -134,9 +124,7 @@ board_ifc: ifc: ifc@ffe1e000 {
 	};
 };
 
-board_soc: soc: soc@ffe00000 {
-	ranges = <0x0 0x0 0xffe00000 0x100000>;
-
+&board_soc {
 	i2c@3000 {
 		eeprom@50 {
 			compatible = "st,24c256";
@@ -211,14 +199,17 @@ board_soc: soc: soc@ffe00000 {
 
 	mdio@24000 {
 		phy0: ethernet-phy@0 {
+			interrupts = <3 1 0 0>;
 			reg = <0x1>;
 		};
 
 		phy1: ethernet-phy@1 {
+			interrupts = <2 1 0 0>;
 			reg = <0x0>;
 		};
 
 		phy2: ethernet-phy@2 {
+			interrupts = <2 1 0 0>;
 			reg = <0x2>;
 		};
 
@@ -270,35 +261,3 @@ board_soc: soc: soc@ffe00000 {
 		ptimer-handle = <&ptp_timer>;
 	};
 };
-
-pci0: pcie@ffe09000 {
-	reg = <0 0xffe09000 0 0x1000>;
-	ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
-		  0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
-
-	pcie@0 {
-		ranges = <0x2000000 0x0 0xa0000000
-			  0x2000000 0x0 0xa0000000
-			  0x0 0x20000000
-
-			  0x1000000 0x0 0x0
-			  0x1000000 0x0 0x0
-			  0x0 0x100000>;
-	};
-};
-
-pci1: pcie@ffe0a000 {
-	reg = <0 0xffe0a000 0 0x1000>;
-	ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
-		  0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
-
-	pcie@0 {
-		ranges = <0x2000000 0x0 0x80000000
-			  0x2000000 0x0 0x80000000
-			  0x0 0x20000000
-
-			  0x1000000 0x0 0x0
-			  0x1000000 0x0 0x0
-			  0x0 0x100000>;
-	};
-};