powerpc/85xx: mpc8548cds - Add RapidIO node to dts

Enable RapidIO and add rapidio and rmu nodes to dts.

Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

diff --git a/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi b/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
index 9d8023a69d7d838340f490fe7934f3448799d82c..579d76cb8e329de15bf3c5efeb214dc4dc09f57b 100644 (file)
--- a/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi
@@ -89,6 +89,21 @@
        };
 };
 
+&rio {
+       compatible = "fsl,srio";
+       interrupts = <48 2 0 0>;
+       #address-cells = <2>;
+       #size-cells = <2>;
+       fsl,srio-rmu-handle = <&rmu>;
+       ranges;
+
+       port1 {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               cell-index = <1>;
+       };
+};
+
 &soc {
        #address-cells = <1>;
        #size-cells = <1>;
@@ -134,6 +149,7 @@
 
 /include/ "pq3-sec2.1-0.dtsi"
 /include/ "pq3-mpic.dtsi"
+/include/ "pq3-rmu-0.dtsi"
 
        global-utilities@e0000 {
                compatible = "fsl,mpc8548-guts";

diff --git a/arch/powerpc/boot/dts/mpc8548cds.dts b/arch/powerpc/boot/dts/mpc8548cds.dts
index c3c8741b4e4cf692856c0c8d0dfe455805118778..8d4df8e7b696dc075865493e839374c66116e87f 100644 (file)
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -339,6 +339,13 @@
                                  0x0 0x100000>;
                };
        };
+
+       rio: rapidio@e00c0000 {
+               reg = <0x0 0xe00c0000 0x0 0x20000>;
+               port1 {
+                       ranges = <0x0 0x0 0x0 0xc0000000 0x0 0x20000000>;
+               };
+       };
 };
 
 /include/ "fsl/mpc8548si-post.dtsi"

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index ce6142cd04a10cea5db7c35b4758377bfc8f5623..f000d81c4e31214f5cf7dd3176419f847fdb0128 100644 (file)
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -40,6 +40,7 @@ config MPC85xx_CDS
        bool "Freescale MPC85xx CDS"
        select DEFAULT_UIMAGE
        select PPC_I8259
+       select HAS_RAPIDIO
        help
          This option enables support for the MPC85xx CDS board