linuxppc-dev.lists.ozlabs.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] powerpc/p1010rdb:update dts to adapt to both old and new p1010rdb
@ 2013-09-22  2:28 Zhao Qiang
  2013-09-27 21:35 ` Scott Wood
  0 siblings, 1 reply; 3+ messages in thread
From: Zhao Qiang @ 2013-09-22  2:28 UTC (permalink / raw)
  To: linuxppc-dev; +Cc: Zhao Qiang, Shengzhou Liu

P1010rdb-pa and p1010rdb-pb have different phy interrupts.
So update dts to adapt to both p1010rdb-pa and p1010rdb-pb.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Signed-off-by: Zhao Qiang <B45475@freescale.com>
---
 arch/powerpc/boot/dts/p1010rdb-pa.dts | 33 ++++++++++++++++++
 arch/powerpc/boot/dts/p1010rdb-pb.dts | 33 ++++++++++++++++++
 arch/powerpc/boot/dts/p1010rdb.dts    | 66 -----------------------------------
 arch/powerpc/boot/dts/p1010rdb.dtsi   | 51 ++++++++++++++++++++++++---
 4 files changed, 112 insertions(+), 71 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pa.dts
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dts
 delete mode 100644 arch/powerpc/boot/dts/p1010rdb.dts

diff --git a/arch/powerpc/boot/dts/p1010rdb-pa.dts b/arch/powerpc/boot/dts/p1010rdb-pa.dts
new file mode 100644
index 0000000..e1688d4
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1010rdb-pa.dts
@@ -0,0 +1,33 @@
+/*
+ * 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
new file mode 100644
index 0000000..37f9366
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1010rdb-pb.dts
@@ -0,0 +1,33 @@
+/*
+ * 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
deleted file mode 100644
index b868d22..0000000
--- a/arch/powerpc/boot/dts/p1010rdb.dts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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 7fc3402..5e5ca56 100644
--- a/arch/powerpc/boot/dts/p1010rdb.dtsi
+++ b/arch/powerpc/boot/dts/p1010rdb.dtsi
@@ -32,7 +32,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-&board_ifc {
+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>;
+
 	nor@0,0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -124,7 +134,9 @@
 	};
 };
 
-&board_soc {
+board_soc: soc: soc@ffe00000 {
+	ranges = <0x0 0x0 0xffe00000 0x100000>;
+
 	i2c@3000 {
 		eeprom@50 {
 			compatible = "st,24c256";
@@ -199,17 +211,14 @@
 
 	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>;
 		};
 
@@ -261,3 +270,35 @@
 		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>;
+	};
+};
-- 
1.8.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc/p1010rdb:update dts to adapt to both old and new p1010rdb
  2013-09-22  2:28 [PATCH] powerpc/p1010rdb:update dts to adapt to both old and new p1010rdb Zhao Qiang
@ 2013-09-27 21:35 ` Scott Wood
  2013-09-29  2:29   ` Zhao Qiang-B45475
  0 siblings, 1 reply; 3+ messages in thread
From: Scott Wood @ 2013-09-27 21:35 UTC (permalink / raw)
  To: Zhao Qiang; +Cc: linuxppc-dev, Shengzhou Liu

On Sun, 2013-09-22 at 10:28 +0800, Zhao Qiang wrote:
> P1010rdb-pa and p1010rdb-pb have different phy interrupts.
> So update dts to adapt to both p1010rdb-pa and p1010rdb-pb.
> 
> Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
> Signed-off-by: Zhao Qiang <B45475@freescale.com>
> ---
>  arch/powerpc/boot/dts/p1010rdb-pa.dts | 33 ++++++++++++++++++
>  arch/powerpc/boot/dts/p1010rdb-pb.dts | 33 ++++++++++++++++++
>  arch/powerpc/boot/dts/p1010rdb.dts    | 66 -----------------------------------
>  arch/powerpc/boot/dts/p1010rdb.dtsi   | 51 ++++++++++++++++++++++++---
>  4 files changed, 112 insertions(+), 71 deletions(-)
>  create mode 100644 arch/powerpc/boot/dts/p1010rdb-pa.dts
>  create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dts
>  delete mode 100644 arch/powerpc/boot/dts/p1010rdb.dts

What about p1010rdb_36b.dts?

-Scott

^ permalink raw reply	[flat|nested] 3+ messages in thread
* RE: [PATCH] powerpc/p1010rdb:update dts to adapt to both old and new p1010rdb
  2013-09-27 21:35 ` Scott Wood
@ 2013-09-29  2:29   ` Zhao Qiang-B45475
  0 siblings, 0 replies; 3+ messages in thread
From: Zhao Qiang-B45475 @ 2013-09-29  2:29 UTC (permalink / raw)
  To: Wood Scott-B07421; +Cc: Liu Shengzhou-B36685, linuxppc-dev

T24gU2F0LCAyMDEzLTA5LTI4IGF0IDU6MzUgQU0sIFNjb3R0IHdyb3RlOg0KDQo+IC0tLS0tT3Jp
Z2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IFdvb2QgU2NvdHQtQjA3NDIxDQo+IFNlbnQ6IFNh
dHVyZGF5LCBTZXB0ZW1iZXIgMjgsIDIwMTMgNTozNSBBTQ0KPiBUbzogWmhhbyBRaWFuZy1CNDU0
NzUNCj4gQ2M6IGxpbnV4cHBjLWRldkBsaXN0cy5vemxhYnMub3JnOyBMaXUgU2hlbmd6aG91LUIz
NjY4NQ0KPiBTdWJqZWN0OiBSZTogW1BBVENIXSBwb3dlcnBjL3AxMDEwcmRiOnVwZGF0ZSBkdHMg
dG8gYWRhcHQgdG8gYm90aCBvbGQgYW5kDQo+IG5ldyBwMTAxMHJkYg0KPiANCj4gT24gU3VuLCAy
MDEzLTA5LTIyIGF0IDEwOjI4ICswODAwLCBaaGFvIFFpYW5nIHdyb3RlOg0KPiA+IFAxMDEwcmRi
LXBhIGFuZCBwMTAxMHJkYi1wYiBoYXZlIGRpZmZlcmVudCBwaHkgaW50ZXJydXB0cy4NCj4gPiBT
byB1cGRhdGUgZHRzIHRvIGFkYXB0IHRvIGJvdGggcDEwMTByZGItcGEgYW5kIHAxMDEwcmRiLXBi
Lg0KPiA+DQo+ID4gU2lnbmVkLW9mZi1ieTogU2hlbmd6aG91IExpdSA8U2hlbmd6aG91LkxpdUBm
cmVlc2NhbGUuY29tPg0KPiA+IFNpZ25lZC1vZmYtYnk6IFpoYW8gUWlhbmcgPEI0NTQ3NUBmcmVl
c2NhbGUuY29tPg0KPiA+IC0tLQ0KPiA+ICBhcmNoL3Bvd2VycGMvYm9vdC9kdHMvcDEwMTByZGIt
cGEuZHRzIHwgMzMgKysrKysrKysrKysrKysrKysrDQo+ID4gYXJjaC9wb3dlcnBjL2Jvb3QvZHRz
L3AxMDEwcmRiLXBiLmR0cyB8IDMzICsrKysrKysrKysrKysrKysrKw0KPiA+ICBhcmNoL3Bvd2Vy
cGMvYm9vdC9kdHMvcDEwMTByZGIuZHRzICAgIHwgNjYgLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tDQo+IC0tLS0tLS0tDQo+ID4gIGFyY2gvcG93ZXJwYy9ib290L2R0cy9wMTAxMHJkYi5kdHNp
ICAgfCA1MSArKysrKysrKysrKysrKysrKysrKysrKystLS0NCj4gPiAgNCBmaWxlcyBjaGFuZ2Vk
LCAxMTIgaW5zZXJ0aW9ucygrKSwgNzEgZGVsZXRpb25zKC0pICBjcmVhdGUgbW9kZQ0KPiA+IDEw
MDY0NCBhcmNoL3Bvd2VycGMvYm9vdC9kdHMvcDEwMTByZGItcGEuZHRzDQo+ID4gIGNyZWF0ZSBt
b2RlIDEwMDY0NCBhcmNoL3Bvd2VycGMvYm9vdC9kdHMvcDEwMTByZGItcGIuZHRzDQo+ID4gIGRl
bGV0ZSBtb2RlIDEwMDY0NCBhcmNoL3Bvd2VycGMvYm9vdC9kdHMvcDEwMTByZGIuZHRzDQo+IA0K
PiBXaGF0IGFib3V0IHAxMDEwcmRiXzM2Yi5kdHM/DQo+IA0KPiAtU2NvdHQNCj4gDQoNClllcywg
d2UgcmVhbGx5IG5lZWQgdG8gdGFrZSAzNmIgaW50byBhY2NvdW50Lg0KTm93LCB0aGVyZSBpcyBh
bm90aGVyIHByb2JsZW0gdG8gYmUgZGlzY3Vzc2VkLg0KSWYgd2UganVzdCBhZGQgZmlsZXMgcDEw
MTByZGItcGIuZHRzIGFuZCBwMTAxMHJkYi1wYl8zNmIuZHRzLCB0aGVyZSB3aWxsIGJlIHNvbWUg
cmVkdW5kYW50IGNvZGVzLg0KSWYgd2Ugd2FudCB0byBhdm9pZCB0aGlzIHNpdHVhdGlvbiwgd2Ug
bmVlZCB0byBhZGQgdHdvIG1vcmUgZHRzaSBmaWxlcy4NCkxlc3MgY29kZXMgb3IgbGVzcyBmaWxl
cywgd2hpY2ggb25lIGRvIHlvdSBsaWtlIGJldHRlcj8NCg0KLVpoYW8gUWlhbmcNCg==

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-09-29  2:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-22  2:28 [PATCH] powerpc/p1010rdb:update dts to adapt to both old and new p1010rdb Zhao Qiang
2013-09-27 21:35 ` Scott Wood
2013-09-29  2:29   ` Zhao Qiang-B45475

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).