1 files changed, 56 insertions, 17 deletions

diff --git a/arch/powerpc/boot/dts/mpc8641_hpcn.dts b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
index 848320e4d3c4..1e8666ccbed8 100644
--- a/arch/powerpc/boot/dts/mpc8641_hpcn.dts
+++ b/arch/powerpc/boot/dts/mpc8641_hpcn.dts
@@ -26,13 +26,6 @@
                 serial1 = &serial1;
                 pci0 = &pci0;
                 pci1 = &pci1;
-/*
- * Only one of Rapid IO or PCI can be present due to HW limitations and
- * due to the fact that the 2 now share address space in the new memory
- * map.  The most likely case is that we have PCI, so comment out the
- * rapidio node.  Leave it here for reference.
- */
-                /* rapidio0 = &rapidio0; */
         };
 
         cpus {
@@ -335,7 +328,7 @@
                 serial0: serial@4500 {
                         cell-index = <0>;
                         device_type = "serial";
-                        compatible = "ns16550";
+                        compatible = "fsl,ns16550", "ns16550";
                         reg = <0x4500 0x100>;
                         clock-frequency = <0>;
                         interrupts = <42 2>;
@@ -345,7 +338,7 @@
                 serial1: serial@4600 {
                         cell-index = <1>;
                         device_type = "serial";
-                        compatible = "ns16550";
+                        compatible = "fsl,ns16550", "ns16550";
                         reg = <0x4600 0x100>;
                         clock-frequency = <0>;
                         interrupts = <28 2>;
@@ -361,6 +354,41 @@
                         device_type = "open-pic";
                 };
 
+                rmu: rmu@d3000 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,srio-rmu";
+                        reg = <0xd3000 0x500>;
+                        ranges = <0x0 0xd3000 0x500>;
+
+                        message-unit@0 {
+                                compatible = "fsl,srio-msg-unit";
+                                reg = <0x0 0x100>;
+                                interrupts = <
+                                        53 2 /* msg1_tx_irq */
+                                        54 2>;/* msg1_rx_irq */
+                        };
+                        message-unit@100 {
+                                compatible = "fsl,srio-msg-unit";
+                                reg = <0x100 0x100>;
+                                interrupts = <
+                                        55 2  /* msg2_tx_irq */
+                                        56 2>;/* msg2_rx_irq */
+                        };
+                        doorbell-unit@400 {
+                                compatible = "fsl,srio-dbell-unit";
+                                reg = <0x400 0x80>;
+                                interrupts = <
+                                        49 2  /* bell_outb_irq */
+                                        50 2>;/* bell_inb_irq */
+                        };
+                        port-write-unit@4e0 {
+                                compatible = "fsl,srio-port-write-unit";
+                                reg = <0x4e0 0x20>;
+                                interrupts = <48 2>;
+                        };
+                };
+
                 global-utilities@e0000 {
                         compatible = "fsl,mpc8641-guts";
                         reg = <0xe0000 0x1000>;
@@ -612,16 +640,27 @@
                 };
         };
 /*
-        rapidio0: rapidio@ffec0000 {
+ * Only one of Rapid IO or PCI can be present due to HW limitations and
+ * due to the fact that the 2 now share address space in the new memory
+ * map.  The most likely case is that we have PCI, so comment out the
+ * rapidio node.  Leave it here for reference.
+
+        rapidio@ffec0000 {
+                reg = <0xffec0000 0x11000>;
+                compatible = "fsl,srio";
+                interrupt-parent = <&mpic>;
+                interrupts = <48 2>;
                 #address-cells = <2>;
                 #size-cells = <2>;
-                compatible = "fsl,rapidio-delta";
-                reg = <0xffec0000 0x20000>;
-                ranges = <0 0 0x80000000 0 0x20000000>;
-                interrupt-parent = <&mpic>;
-                // err_irq bell_outb_irq bell_inb_irq
-                //      msg1_tx_irq msg1_rx_irq msg2_tx_irq msg2_rx_irq
-                interrupts = <48 2 49 2 50 2 53 2 54 2 55 2 56 2>;
+                fsl,srio-rmu-handle = <&rmu>;
+                ranges;
+
+                port1 {
+                        #address-cells = <2>;
+                        #size-cells = <2>;
+                        cell-index = <1>;
+                        ranges = <0 0 0x80000000 0 0x20000000>;
+                };
         };
 */