Patchwork [5/6] powerpc/85xx: Enable Serial RapidIO for MPC85xx MDS boards

login
register
mail settings
Submitter Anton Vorontsov
Date May 2, 2009, 2:16 a.m.
Message ID <20090502021656.GE18281@oksana.dev.rtsoft.ru>
Download mbox | patch
Permalink /patch/26796/
State Accepted, archived
Commit 5e8306fe5de2ce0c3272abd4b8ab20323a8bf0ff
Delegated to: Kumar Gala
Headers show

Comments

Anton Vorontsov - May 2, 2009, 2:16 a.m.
Select HAS_RAPIDIO symbol and add rio nodes for MPC8568E-MDS
and MPC8569E-MDS boards.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
---
 arch/powerpc/boot/dts/mpc8568mds.dts |   17 +++++++++++++++++
 arch/powerpc/boot/dts/mpc8569mds.dts |   17 +++++++++++++++++
 arch/powerpc/platforms/85xx/Kconfig  |    1 +
 3 files changed, 35 insertions(+), 0 deletions(-)
Kumar Gala - May 8, 2009, 2:14 p.m.
On May 1, 2009, at 9:16 PM, Anton Vorontsov wrote:

> Select HAS_RAPIDIO symbol and add rio nodes for MPC8568E-MDS
> and MPC8569E-MDS boards.
>
> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
> ---
> arch/powerpc/boot/dts/mpc8568mds.dts |   17 +++++++++++++++++
> arch/powerpc/boot/dts/mpc8569mds.dts |   17 +++++++++++++++++
> arch/powerpc/platforms/85xx/Kconfig  |    1 +
> 3 files changed, 35 insertions(+), 0 deletions(-)


applied to next

- k

Patch

diff --git a/arch/powerpc/boot/dts/mpc8568mds.dts b/arch/powerpc/boot/dts/mpc8568mds.dts
index fcab168..473fce6 100644
--- a/arch/powerpc/boot/dts/mpc8568mds.dts
+++ b/arch/powerpc/boot/dts/mpc8568mds.dts
@@ -26,6 +26,7 @@ 
 		serial1 = &serial1;
 		pci0 = &pci0;
 		pci1 = &pci1;
+		rapidio0 = &rio0;
 	};
 
 	cpus {
@@ -539,4 +540,20 @@ 
 				  0x0 0x800000>;
 		};
 	};
+
+	rio0: rapidio@e00c00000 {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "fsl,mpc8568-rapidio", "fsl,rapidio-delta";
+		reg = <0xe00c0000 0x20000>;
+		ranges = <0x0 0x0 0xc0000000 0x0 0x20000000>;
+		interrupts = <48 2 /* error     */
+			      49 2 /* bell_outb */
+			      50 2 /* bell_inb  */
+			      53 2 /* msg1_tx   */
+			      54 2 /* msg1_rx   */
+			      55 2 /* msg2_tx   */
+			      56 2 /* msg2_rx   */>;
+		interrupt-parent = <&mpic>;
+	};
 };
diff --git a/arch/powerpc/boot/dts/mpc8569mds.dts b/arch/powerpc/boot/dts/mpc8569mds.dts
index 14120d7..975f2c5 100644
--- a/arch/powerpc/boot/dts/mpc8569mds.dts
+++ b/arch/powerpc/boot/dts/mpc8569mds.dts
@@ -25,6 +25,7 @@ 
 		ethernet2 = &enet2;
 		ethernet3 = &enet3;
 		pci1 = &pci1;
+		rapidio0 = &rio0;
 	};
 
 	cpus {
@@ -528,4 +529,20 @@ 
 				  0x0 0x800000>;
 		};
 	};
+
+	rio0: rapidio@e00c00000 {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "fsl,mpc8569-rapidio", "fsl,rapidio-delta";
+		reg = <0xe00c0000 0x20000>;
+		ranges = <0x0 0x0 0xc0000000 0x0 0x20000000>;
+		interrupts = <48 2 /* error     */
+			      49 2 /* bell_outb */
+			      50 2 /* bell_inb  */
+			      53 2 /* msg1_tx   */
+			      54 2 /* msg1_rx   */
+			      55 2 /* msg2_tx   */
+			      56 2 /* msg2_rx   */>;
+		interrupt-parent = <&mpic>;
+	};
 };
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 7f066ad..43d385c 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -34,6 +34,7 @@  config MPC85xx_MDS
 	bool "Freescale MPC85xx MDS"
 	select DEFAULT_UIMAGE
 	select PHYLIB
+	select HAS_RAPIDIO
 	help
 	  This option enables support for the MPC85xx MDS board