Skip to contentSkip to conversation

powerpc/p1010rdb-pb:make a new dts for p1010rdb-pb

PATCH In review Zhao Qiang 3 participants 3 messages Sep 18, 2013 – Sep 26, 2013

Subsystems (3)
lore
Share & tools
lore

Zhao Qiang

author
#0 lore raw

PATCH v3 1/1 powerpc/p1010rdb-pb:make a new dts for p1010rdb-pb

P1010RDB-PA and P1010RDB-PB boards use different external PHY interrupt signals.
So make a new dts for P1010RDB-PB.

---
Changes for v2:
-Remove phy interrupts for p1010rdb-pb
Changes for v3:
-Maintain the phy interrupts p1010rdb-pa and make a new device tree for p1010rdb-pb

 arch/powerpc/boot/dts/p1010rdb-pa.dtsi | 11 ++++++
 arch/powerpc/boot/dts/p1010rdb-pb.dts  | 67 ++++++++++++++++++++++++++++++++++
 arch/powerpc/boot/dts/p1010rdb-pb.dtsi | 11 ++++++
 arch/powerpc/boot/dts/p1010rdb.dts     |  1 +
 arch/powerpc/boot/dts/p1010rdb.dtsi    |  3 --
 arch/powerpc/platforms/85xx/p1010rdb.c | 29 +++++++++++++++
 6 files changed, 119 insertions(+), 3 deletions(-)
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pa.dtsi
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dts
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dtsi
arch/powerpc/boot/dts/p1010rdb-pa.dtsi new file +11 -0
new file mode 100644
index 0000000..122996e
@@ -0,0 +1,11 @@
+&phy0 {
+	interrupts = <3 1 0 0>;
+};
+
+&phy1 {
+	interrupts = <2 1 0 0>;
+};
+
+&phy2 {
+	interrupts = <2 1 0 0>;
+};
arch/powerpc/boot/dts/p1010rdb-pb.dts new file +67 -0

67 lines not on this page · raw message

arch/powerpc/boot/dts/p1010rdb-pb.dtsi new file +11 -0
new file mode 100644
index 0000000..52cd22e
@@ -0,0 +1,11 @@
+&phy0 {
+	interrupts = <0 1 0 0>;
+};
+
+&phy1 {
+	interrupts = <2 1 0 0>;
+};
+
+&phy2 {
+	interrupts = <1 1 0 0>;
+};
arch/powerpc/boot/dts/p1010rdb.dts +1 -0
index b868d22..0980ff0 100644
@@ -63,4 +63,5 @@
 };
 
 /include/ "p1010rdb.dtsi"
+/include/ "p1010rdb-pa.dtsi"
 /include/ "fsl/p1010si-post.dtsi"
arch/powerpc/boot/dts/p1010rdb.dtsi +0 -3
index 7fc3402..2433ae4 100644
@@ -199,17 +199,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>;
 		};
 
arch/powerpc/platforms/85xx/p1010rdb.c +29 -0
index 0252961..7d9eab7 100644
@@ -82,3 +82,32 @@ define_machine(p1010_rdb) {
 	.calibrate_decr		= generic_calibrate_decr,
 	.progress		= udbg_progress,
 };
+
+machine_arch_initcall(p1010_rdb_pb, mpc85xx_common_publish_devices);
+machine_arch_initcall(p1010_rdb_pb, swiotlb_setup_bus_notifier);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init p1010_rdb_pb_probe(void)
+{
+	unsigned long root = of_get_flat_dt_root();
+
+	if (of_flat_dt_is_compatible(root, "fsl,P1010RDB-PB"))
+		return 1;
+	return 0;
+}
+
+define_machine(p1010_rdb_pb) {
+	.name			= "P1010 RDB-PB",
+	.probe			= p1010_rdb_pb_probe,
+	.setup_arch		= p1010_rdb_setup_arch,
+	.init_IRQ		= p1010_rdb_pic_init,
+#ifdef CONFIG_PCI
+	.pcibios_fixup_bus	= fsl_pcibios_fixup_bus,
+#endif
+	.get_irq		= mpic_get_irq,
+	.restart		= fsl_rstcr_restart,
+	.calibrate_decr		= generic_calibrate_decr,
+	.progress		= udbg_progress,
+};
Signature · 1 line
1.8.0
#1 lore raw
Quoted 10 lines

-----Original Message-----
From: Zhao Qiang-B45475
Sent: Wednesday, September 18, 2013 12:55 PM
To: [email protected]
Cc: Zhao Qiang-B45475; Liu Shengzhou-B36685
Subject: [PATCH v3] powerpc/p1010rdb-pb:make a new dts for p1010rdb-pb =20
P1010RDB-PA and P1010RDB-PB boards use different external PHY interrupt s=

ignals.

Quoted 11 lines

So make a new dts for P1010RDB-PB.
=20

---
Changes for v2:
-Remove phy interrupts for p1010rdb-pb
Changes for v3:
-Maintain the phy interrupts p1010rdb-pa and make a new device tree for p1010rdb-pb
=20

Quoted 2 lines
 arch/powerpc/boot/dts/p1010rdb-pa.dtsi | 11 ++++++

arch/powerpc/boot/dts/p1010rdb-pb.dts | 67 +++++++++++++++++++++++++++++=

+++++

Quoted 9 lines
 arch/powerpc/boot/dts/p1010rdb-pb.dtsi | 11 ++++++
 arch/powerpc/boot/dts/p1010rdb.dts     |  1 +
 arch/powerpc/boot/dts/p1010rdb.dtsi    |  3 --
 arch/powerpc/platforms/85xx/p1010rdb.c | 29 +++++++++++++++
 6 files changed, 119 insertions(+), 3 deletions(-)  create mode 100644
arch/powerpc/boot/dts/p1010rdb-pa.dtsi
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dts
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dtsi

=20

Don't touch p1010rdb.c, create two p1010rdb-pa.dts and p1010rdb-pb.dts, whi= ch include the common p1010rdb.dtsi.
Combine original p1010rdb.dts and p1010rdb.dtsi into new p1010rdb.dtsi with=
removing compatible part.
Place phy node and following part in p1010rdb-pa.dts and p1010rdb-pb.dts.

/ {
        model =3D "fsl,P1010RDB-PA";
        compatible =3D "fsl,P1010RDB";

}

/ {
        model =3D "fsl,P1010RDB-PB";
        compatible =3D "fsl,P1010RDB";

}

-Shengzhou

#2 lore raw
Quoted 38 lines · On Wed, 2013-09-18 at 05:43 +0000, Liu Shengzhou-B36685 wrote:
Quoted 20 lines

-----Original Message-----
From: Zhao Qiang-B45475
Sent: Wednesday, September 18, 2013 12:55 PM
To: [email protected]
Cc: Zhao Qiang-B45475; Liu Shengzhou-B36685
Subject: [PATCH v3] powerpc/p1010rdb-pb:make a new dts for p1010rdb-pb

P1010RDB-PA and P1010RDB-PB boards use different external PHY interrupt signals. So make a new dts for P1010RDB-PB.

---
Changes for v2:
-Remove phy interrupts for p1010rdb-pb
Changes for v3:
-Maintain the phy interrupts p1010rdb-pa and make a new device tree for p1010rdb-pb

Quoted 11 lines
 arch/powerpc/boot/dts/p1010rdb-pa.dtsi | 11 ++++++
arch/powerpc/boot/dts/p1010rdb-pb.dts  | 67 ++++++++++++++++++++++++++++++++++
 arch/powerpc/boot/dts/p1010rdb-pb.dtsi | 11 ++++++
 arch/powerpc/boot/dts/p1010rdb.dts     |  1 +
 arch/powerpc/boot/dts/p1010rdb.dtsi    |  3 --
 arch/powerpc/platforms/85xx/p1010rdb.c | 29 +++++++++++++++
 6 files changed, 119 insertions(+), 3 deletions(-)  create mode 100644
arch/powerpc/boot/dts/p1010rdb-pa.dtsi
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dts
 create mode 100644 arch/powerpc/boot/dts/p1010rdb-pb.dtsi

Don't touch p1010rdb.c, create two p1010rdb-pa.dts and p1010rdb-pb.dts, which include the common p1010rdb.dtsi. Combine original p1010rdb.dts and p1010rdb.dtsi into new p1010rdb.dtsi with removing compatible part. Place phy node and following part in p1010rdb-pa.dts and p1010rdb-pb.dts.

/ {
        model = "fsl,P1010RDB-PA";
        compatible = "fsl,P1010RDB";
Quoted 6 lines

}

/ {
        model = "fsl,P1010RDB-PB";
        compatible = "fsl,P1010RDB";

}

Model is mainly for human consumption and generally redundant on the toplevel node... These boards are obviously not fully compatible and thus there should be a new "fsl,p1010rdb-pb" with the existing "fsl,P1010RDB" used to refer to PA since we can't change it now.

-Scott