3 files changed, 504 insertions, 254 deletions

diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index af2425e4655f..3d920376f58e 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1,5 +1,8 @@
 /*
- * MPC85xx RapidIO support
+ * Freescale MPC85xx/MPC86xx RapidIO support
+ *
+ * Copyright (C) 2007, 2008 Freescale Semiconductor, Inc.
+ * Zhang Wei <wei.zhang@freescale.com>
  *
  * Copyright 2005 MontaVista Software, Inc.
  * Matt Porter <mporter@kernel.crashing.org>
@@ -17,12 +20,23 @@
 #include <linux/interrupt.h>
 #include <linux/rio.h>
 #include <linux/rio_drv.h>
+#include <linux/of_platform.h>
+#include <linux/delay.h>
 
 #include <asm/io.h>
 
-#define RIO_REGS_BASE           (CCSRBAR + 0xc0000)
+/* RapidIO definition irq, which read from OF-tree */
+#define IRQ_RIO_BELL(m)         (((struct rio_priv *)(m->priv))->bellirq)
+#define IRQ_RIO_TX(m)           (((struct rio_priv *)(m->priv))->txirq)
+#define IRQ_RIO_RX(m)           (((struct rio_priv *)(m->priv))->rxirq)
+
 #define RIO_ATMU_REGS_OFFSET    0x10c00
-#define RIO_MSG_REGS_OFFSET     0x11000
+#define RIO_P_MSG_REGS_OFFSET   0x11000
+#define RIO_S_MSG_REGS_OFFSET   0x13000
+#define RIO_ESCSR               0x158
+#define RIO_CCSR                0x15c
+#define RIO_ISR_AACR            0x10120
+#define RIO_ISR_AACR_AA         0x1     /* Accept All ID */
 #define RIO_MAINT_WIN_SIZE      0x400000
 #define RIO_DBELL_WIN_SIZE      0x1000
 
@@ -50,18 +64,18 @@
 #define DOORBELL_DSR_TE         0x00000080
 #define DOORBELL_DSR_QFI        0x00000010
 #define DOORBELL_DSR_DIQI       0x00000001
-#define DOORBELL_TID_OFFSET     0x03
-#define DOORBELL_SID_OFFSET     0x05
+#define DOORBELL_TID_OFFSET     0x02
+#define DOORBELL_SID_OFFSET     0x04
 #define DOORBELL_INFO_OFFSET    0x06
 
 #define DOORBELL_MESSAGE_SIZE   0x08
-#define DBELL_SID(x)            (*(u8 *)(x + DOORBELL_SID_OFFSET))
-#define DBELL_TID(x)            (*(u8 *)(x + DOORBELL_TID_OFFSET))
+#define DBELL_SID(x)            (*(u16 *)(x + DOORBELL_SID_OFFSET))
+#define DBELL_TID(x)            (*(u16 *)(x + DOORBELL_TID_OFFSET))
 #define DBELL_INF(x)            (*(u16 *)(x + DOORBELL_INFO_OFFSET))
 
 struct rio_atmu_regs {
         u32 rowtar;
-        u32 pad1;
+        u32 rowtear;
         u32 rowbar;
         u32 pad2;
         u32 rowar;
@@ -87,7 +101,15 @@ struct rio_msg_regs {
         u32 ifqdpar;
         u32 pad6;
         u32 ifqepar;
-        u32 pad7[250];
+        u32 pad7[226];
+        u32 odmr;
+        u32 odsr;
+        u32 res0[4];
+        u32 oddpr;
+        u32 oddatr;
+        u32 res1[3];
+        u32 odretcr;
+        u32 res2[12];
         u32 dmr;
         u32 dsr;
         u32 pad8;
@@ -112,20 +134,12 @@ struct rio_tx_desc {
         u32 res4;
 };
 
-static u32 regs_win;
-static struct rio_atmu_regs *atmu_regs;
-static struct rio_atmu_regs *maint_atmu_regs;
-static struct rio_atmu_regs *dbell_atmu_regs;
-static u32 dbell_win;
-static u32 maint_win;
-static struct rio_msg_regs *msg_regs;
-
-static struct rio_dbell_ring {
+struct rio_dbell_ring {
         void *virt;
         dma_addr_t phys;
-} dbell_ring;
+};
 
-static struct rio_msg_tx_ring {
+struct rio_msg_tx_ring {
         void *virt;
         dma_addr_t phys;
         void *virt_buffer[RIO_MAX_TX_RING_SIZE];
@@ -133,19 +147,35 @@ static struct rio_msg_tx_ring {
         int tx_slot;
         int size;
         void *dev_id;
-} msg_tx_ring;
+};
 
-static struct rio_msg_rx_ring {
+struct rio_msg_rx_ring {
         void *virt;
         dma_addr_t phys;
         void *virt_buffer[RIO_MAX_RX_RING_SIZE];
         int rx_slot;
         int size;
         void *dev_id;
-} msg_rx_ring;
+};
+
+struct rio_priv {
+        void __iomem *regs_win;
+        struct rio_atmu_regs __iomem *atmu_regs;
+        struct rio_atmu_regs __iomem *maint_atmu_regs;
+        struct rio_atmu_regs __iomem *dbell_atmu_regs;
+        void __iomem *dbell_win;
+        void __iomem *maint_win;
+        struct rio_msg_regs __iomem *msg_regs;
+        struct rio_dbell_ring dbell_ring;
+        struct rio_msg_tx_ring msg_tx_ring;
+        struct rio_msg_rx_ring msg_rx_ring;
+        int bellirq;
+        int txirq;
+        int rxirq;
+};
 
 /**
- * mpc85xx_rio_doorbell_send - Send a MPC85xx doorbell message
+ * fsl_rio_doorbell_send - Send a MPC85xx doorbell message
  * @index: ID of RapidIO interface
  * @destid: Destination ID of target device
  * @data: 16-bit info field of RapidIO doorbell message
@@ -153,18 +183,34 @@ static struct rio_msg_rx_ring {
  * Sends a MPC85xx doorbell message. Returns %0 on success or
  * %-EINVAL on failure.
  */
-static int mpc85xx_rio_doorbell_send(int index, u16 destid, u16 data)
+static int fsl_rio_doorbell_send(struct rio_mport *mport,
+                                int index, u16 destid, u16 data)
 {
-        pr_debug("mpc85xx_doorbell_send: index %d destid %4.4x data %4.4x\n",
+        struct rio_priv *priv = mport->priv;
+        pr_debug("fsl_doorbell_send: index %d destid %4.4x data %4.4x\n",
                  index, destid, data);
-        out_be32((void *)&dbell_atmu_regs->rowtar, destid << 22);
-        out_be16((void *)(dbell_win), data);
+        switch (mport->phy_type) {
+        case RIO_PHY_PARALLEL:
+                out_be32(&priv->dbell_atmu_regs->rowtar, destid << 22);
+                out_be16(priv->dbell_win, data);
+                break;
+        case RIO_PHY_SERIAL:
+                /* In the serial version silicons, such as MPC8548, MPC8641,
+                 * below operations is must be.
+                 */
+                out_be32(&priv->msg_regs->odmr, 0x00000000);
+                out_be32(&priv->msg_regs->odretcr, 0x00000004);
+                out_be32(&priv->msg_regs->oddpr, destid << 16);
+                out_be32(&priv->msg_regs->oddatr, data);
+                out_be32(&priv->msg_regs->odmr, 0x00000001);
+                break;
+        }
 
         return 0;
 }
 
 /**
- * mpc85xx_local_config_read - Generate a MPC85xx local config space read
+ * fsl_local_config_read - Generate a MPC85xx local config space read
  * @index: ID of RapdiIO interface
  * @offset: Offset into configuration space
  * @len: Length (in bytes) of the maintenance transaction
@@ -173,17 +219,19 @@ static int mpc85xx_rio_doorbell_send(int index, u16 destid, u16 data)
  * Generates a MPC85xx local configuration space read. Returns %0 on
  * success or %-EINVAL on failure.
  */
-static int mpc85xx_local_config_read(int index, u32 offset, int len, u32 * data)
+static int fsl_local_config_read(struct rio_mport *mport,
+                                int index, u32 offset, int len, u32 *data)
 {
-        pr_debug("mpc85xx_local_config_read: index %d offset %8.8x\n", index,
+        struct rio_priv *priv = mport->priv;
+        pr_debug("fsl_local_config_read: index %d offset %8.8x\n", index,
                  offset);
-        *data = in_be32((void *)(regs_win + offset));
+        *data = in_be32(priv->regs_win + offset);
 
         return 0;
 }
 
 /**
- * mpc85xx_local_config_write - Generate a MPC85xx local config space write
+ * fsl_local_config_write - Generate a MPC85xx local config space write
  * @index: ID of RapdiIO interface
  * @offset: Offset into configuration space
  * @len: Length (in bytes) of the maintenance transaction
@@ -192,18 +240,20 @@ static int mpc85xx_local_config_read(int index, u32 offset, int len, u32 * data)
  * Generates a MPC85xx local configuration space write. Returns %0 on
  * success or %-EINVAL on failure.
  */
-static int mpc85xx_local_config_write(int index, u32 offset, int len, u32 data)
+static int fsl_local_config_write(struct rio_mport *mport,
+                                int index, u32 offset, int len, u32 data)
 {
+        struct rio_priv *priv = mport->priv;
         pr_debug
-            ("mpc85xx_local_config_write: index %d offset %8.8x data %8.8x\n",
+            ("fsl_local_config_write: index %d offset %8.8x data %8.8x\n",
              index, offset, data);
-        out_be32((void *)(regs_win + offset), data);
+        out_be32(priv->regs_win + offset, data);
 
         return 0;
 }
 
 /**
- * mpc85xx_rio_config_read - Generate a MPC85xx read maintenance transaction
+ * fsl_rio_config_read - Generate a MPC85xx read maintenance transaction
  * @index: ID of RapdiIO interface
  * @destid: Destination ID of transaction
  * @hopcount: Number of hops to target device
@@ -215,18 +265,19 @@ static int mpc85xx_local_config_write(int index, u32 offset, int len, u32 data)
  * success or %-EINVAL on failure.
  */
 static int
-mpc85xx_rio_config_read(int index, u16 destid, u8 hopcount, u32 offset, int len,
-                        u32 * val)
+fsl_rio_config_read(struct rio_mport *mport, int index, u16 destid,
+                        u8 hopcount, u32 offset, int len, u32 *val)
 {
+        struct rio_priv *priv = mport->priv;
         u8 *data;
 
         pr_debug
-            ("mpc85xx_rio_config_read: index %d destid %d hopcount %d offset %8.8x len %d\n",
+            ("fsl_rio_config_read: index %d destid %d hopcount %d offset %8.8x len %d\n",
              index, destid, hopcount, offset, len);
-        out_be32((void *)&maint_atmu_regs->rowtar,
+        out_be32(&priv->maint_atmu_regs->rowtar,
                  (destid << 22) | (hopcount << 12) | ((offset & ~0x3) >> 9));
 
-        data = (u8 *) maint_win + offset;
+        data = (u8 *) priv->maint_win + offset;
         switch (len) {
         case 1:
                 *val = in_8((u8 *) data);
@@ -243,7 +294,7 @@ mpc85xx_rio_config_read(int index, u16 destid, u8 hopcount, u32 offset, int len,
 }
 
 /**
- * mpc85xx_rio_config_write - Generate a MPC85xx write maintenance transaction
+ * fsl_rio_config_write - Generate a MPC85xx write maintenance transaction
  * @index: ID of RapdiIO interface
  * @destid: Destination ID of transaction
  * @hopcount: Number of hops to target device
@@ -255,17 +306,18 @@ mpc85xx_rio_config_read(int index, u16 destid, u8 hopcount, u32 offset, int len,
  * success or %-EINVAL on failure.
  */
 static int
-mpc85xx_rio_config_write(int index, u16 destid, u8 hopcount, u32 offset,
-                         int len, u32 val)
+fsl_rio_config_write(struct rio_mport *mport, int index, u16 destid,
+                        u8 hopcount, u32 offset, int len, u32 val)
 {
+        struct rio_priv *priv = mport->priv;
         u8 *data;
         pr_debug
-            ("mpc85xx_rio_config_write: index %d destid %d hopcount %d offset %8.8x len %d val %8.8x\n",
+            ("fsl_rio_config_write: index %d destid %d hopcount %d offset %8.8x len %d val %8.8x\n",
              index, destid, hopcount, offset, len, val);
-        out_be32((void *)&maint_atmu_regs->rowtar,
+        out_be32(&priv->maint_atmu_regs->rowtar,
                  (destid << 22) | (hopcount << 12) | ((offset & ~0x3) >> 9));
 
-        data = (u8 *) maint_win + offset;
+        data = (u8 *) priv->maint_win + offset;
         switch (len) {
         case 1:
                 out_8((u8 *) data, val);
@@ -296,9 +348,10 @@ int
 rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
                         void *buffer, size_t len)
 {
+        struct rio_priv *priv = mport->priv;
         u32 omr;
-        struct rio_tx_desc *desc =
-            (struct rio_tx_desc *)msg_tx_ring.virt + msg_tx_ring.tx_slot;
+        struct rio_tx_desc *desc = (struct rio_tx_desc *)priv->msg_tx_ring.virt
+                                        + priv->msg_tx_ring.tx_slot;
         int ret = 0;
 
         pr_debug
@@ -311,31 +364,43 @@ rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
         }
 
         /* Copy and clear rest of buffer */
-        memcpy(msg_tx_ring.virt_buffer[msg_tx_ring.tx_slot], buffer, len);
+        memcpy(priv->msg_tx_ring.virt_buffer[priv->msg_tx_ring.tx_slot], buffer,
+                        len);
         if (len < (RIO_MAX_MSG_SIZE - 4))
-                memset((void *)((u32) msg_tx_ring.
-                                virt_buffer[msg_tx_ring.tx_slot] + len), 0,
-                       RIO_MAX_MSG_SIZE - len);
+                memset(priv->msg_tx_ring.virt_buffer[priv->msg_tx_ring.tx_slot]
+                                + len, 0, RIO_MAX_MSG_SIZE - len);
 
-        /* Set mbox field for message */
-        desc->dport = mbox & 0x3;
+        switch (mport->phy_type) {
+        case RIO_PHY_PARALLEL:
+                /* Set mbox field for message */
+                desc->dport = mbox & 0x3;
 
-        /* Enable EOMI interrupt, set priority, and set destid */
-        desc->dattr = 0x28000000 | (rdev->destid << 2);
+                /* Enable EOMI interrupt, set priority, and set destid */
+                desc->dattr = 0x28000000 | (rdev->destid << 2);
+                break;
+        case RIO_PHY_SERIAL:
+                /* Set mbox field for message, and set destid */
+                desc->dport = (rdev->destid << 16) | (mbox & 0x3);
+
+                /* Enable EOMI interrupt and priority */
+                desc->dattr = 0x28000000;
+                break;
+        }
 
         /* Set transfer size aligned to next power of 2 (in double words) */
         desc->dwcnt = is_power_of_2(len) ? len : 1 << get_bitmask_order(len);
 
         /* Set snooping and source buffer address */
-        desc->saddr = 0x00000004 | msg_tx_ring.phys_buffer[msg_tx_ring.tx_slot];
+        desc->saddr = 0x00000004
+                | priv->msg_tx_ring.phys_buffer[priv->msg_tx_ring.tx_slot];
 
         /* Increment enqueue pointer */
-        omr = in_be32((void *)&msg_regs->omr);
-        out_be32((void *)&msg_regs->omr, omr | RIO_MSG_OMR_MUI);
+        omr = in_be32(&priv->msg_regs->omr);
+        out_be32(&priv->msg_regs->omr, omr | RIO_MSG_OMR_MUI);
 
         /* Go to next descriptor */
-        if (++msg_tx_ring.tx_slot == msg_tx_ring.size)
-                msg_tx_ring.tx_slot = 0;
+        if (++priv->msg_tx_ring.tx_slot == priv->msg_tx_ring.size)
+                priv->msg_tx_ring.tx_slot = 0;
 
       out:
         return ret;
@@ -344,7 +409,7 @@ rio_hw_add_outb_message(struct rio_mport *mport, struct rio_dev *rdev, int mbox,
 EXPORT_SYMBOL_GPL(rio_hw_add_outb_message);
 
 /**
- * mpc85xx_rio_tx_handler - MPC85xx outbound message interrupt handler
+ * fsl_rio_tx_handler - MPC85xx outbound message interrupt handler
  * @irq: Linux interrupt number
  * @dev_instance: Pointer to interrupt-specific data
  *
@@ -352,32 +417,34 @@ EXPORT_SYMBOL_GPL(rio_hw_add_outb_message);
  * mailbox event handler and acks the interrupt occurrence.
  */
 static irqreturn_t
-mpc85xx_rio_tx_handler(int irq, void *dev_instance)
+fsl_rio_tx_handler(int irq, void *dev_instance)
 {
         int osr;
         struct rio_mport *port = (struct rio_mport *)dev_instance;
+        struct rio_priv *priv = port->priv;
 
-        osr = in_be32((void *)&msg_regs->osr);
+        osr = in_be32(&priv->msg_regs->osr);
 
         if (osr & RIO_MSG_OSR_TE) {
                 pr_info("RIO: outbound message transmission error\n");
-                out_be32((void *)&msg_regs->osr, RIO_MSG_OSR_TE);
+                out_be32(&priv->msg_regs->osr, RIO_MSG_OSR_TE);
                 goto out;
         }
 
         if (osr & RIO_MSG_OSR_QOI) {
                 pr_info("RIO: outbound message queue overflow\n");
-                out_be32((void *)&msg_regs->osr, RIO_MSG_OSR_QOI);
+                out_be32(&priv->msg_regs->osr, RIO_MSG_OSR_QOI);
                 goto out;
         }
 
         if (osr & RIO_MSG_OSR_EOMI) {
-                u32 dqp = in_be32((void *)&msg_regs->odqdpar);
-                int slot = (dqp - msg_tx_ring.phys) >> 5;
-                port->outb_msg[0].mcback(port, msg_tx_ring.dev_id, -1, slot);
+                u32 dqp = in_be32(&priv->msg_regs->odqdpar);
+                int slot = (dqp - priv->msg_tx_ring.phys) >> 5;
+                port->outb_msg[0].mcback(port, priv->msg_tx_ring.dev_id, -1,
+                                slot);
 
                 /* Ack the end-of-message interrupt */
-                out_be32((void *)&msg_regs->osr, RIO_MSG_OSR_EOMI);
+                out_be32(&priv->msg_regs->osr, RIO_MSG_OSR_EOMI);
         }
 
       out:
@@ -398,6 +465,7 @@ mpc85xx_rio_tx_handler(int irq, void *dev_instance)
 int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
 {
         int i, j, rc = 0;
+        struct rio_priv *priv = mport->priv;
 
         if ((entries < RIO_MIN_TX_RING_SIZE) ||
             (entries > RIO_MAX_TX_RING_SIZE) || (!is_power_of_2(entries))) {
@@ -406,54 +474,53 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr
         }
 
         /* Initialize shadow copy ring */
-        msg_tx_ring.dev_id = dev_id;
-        msg_tx_ring.size = entries;
-
-        for (i = 0; i < msg_tx_ring.size; i++) {
-                if (!
-                    (msg_tx_ring.virt_buffer[i] =
-                     dma_alloc_coherent(NULL, RIO_MSG_BUFFER_SIZE,
-                                        &msg_tx_ring.phys_buffer[i],
-                                        GFP_KERNEL))) {
+        priv->msg_tx_ring.dev_id = dev_id;
+        priv->msg_tx_ring.size = entries;
+
+        for (i = 0; i < priv->msg_tx_ring.size; i++) {
+                priv->msg_tx_ring.virt_buffer[i] =
+                        dma_alloc_coherent(NULL, RIO_MSG_BUFFER_SIZE,
+                                &priv->msg_tx_ring.phys_buffer[i], GFP_KERNEL);
+                if (!priv->msg_tx_ring.virt_buffer[i]) {
                         rc = -ENOMEM;
-                        for (j = 0; j < msg_tx_ring.size; j++)
-                                if (msg_tx_ring.virt_buffer[j])
+                        for (j = 0; j < priv->msg_tx_ring.size; j++)
+                                if (priv->msg_tx_ring.virt_buffer[j])
                                         dma_free_coherent(NULL,
-                                                          RIO_MSG_BUFFER_SIZE,
-                                                          msg_tx_ring.
-                                                          virt_buffer[j],
-                                                          msg_tx_ring.
-                                                          phys_buffer[j]);
+                                                        RIO_MSG_BUFFER_SIZE,
+                                                        priv->msg_tx_ring.
+                                                        virt_buffer[j],
+                                                        priv->msg_tx_ring.
+                                                        phys_buffer[j]);
                         goto out;
                 }
         }
 
         /* Initialize outbound message descriptor ring */
-        if (!(msg_tx_ring.virt = dma_alloc_coherent(NULL,
-                                                    msg_tx_ring.size *
-                                                    RIO_MSG_DESC_SIZE,
-                                                    &msg_tx_ring.phys,
-                                                    GFP_KERNEL))) {
+        priv->msg_tx_ring.virt = dma_alloc_coherent(NULL,
+                                priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
+                                &priv->msg_tx_ring.phys, GFP_KERNEL);
+        if (!priv->msg_tx_ring.virt) {
                 rc = -ENOMEM;
                 goto out_dma;
         }
-        memset(msg_tx_ring.virt, 0, msg_tx_ring.size * RIO_MSG_DESC_SIZE);
-        msg_tx_ring.tx_slot = 0;
+        memset(priv->msg_tx_ring.virt, 0,
+                        priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE);
+        priv->msg_tx_ring.tx_slot = 0;
 
         /* Point dequeue/enqueue pointers at first entry in ring */
-        out_be32((void *)&msg_regs->odqdpar, msg_tx_ring.phys);
-        out_be32((void *)&msg_regs->odqepar, msg_tx_ring.phys);
+        out_be32(&priv->msg_regs->odqdpar, priv->msg_tx_ring.phys);
+        out_be32(&priv->msg_regs->odqepar, priv->msg_tx_ring.phys);
 
         /* Configure for snooping */
-        out_be32((void *)&msg_regs->osar, 0x00000004);
+        out_be32(&priv->msg_regs->osar, 0x00000004);
 
         /* Clear interrupt status */
-        out_be32((void *)&msg_regs->osr, 0x000000b3);
+        out_be32(&priv->msg_regs->osr, 0x000000b3);
 
         /* Hook up outbound message handler */
-        if ((rc =
-             request_irq(MPC85xx_IRQ_RIO_TX, mpc85xx_rio_tx_handler, 0,
-                         "msg_tx", (void *)mport)) < 0)
+        rc = request_irq(IRQ_RIO_TX(mport), fsl_rio_tx_handler, 0,
+                         "msg_tx", (void *)mport);
+        if (rc < 0)
                 goto out_irq;
 
         /*
@@ -463,28 +530,28 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr
          *      Chaining mode
          *      Disable
          */
-        out_be32((void *)&msg_regs->omr, 0x00100220);
+        out_be32(&priv->msg_regs->omr, 0x00100220);
 
         /* Set number of entries */
-        out_be32((void *)&msg_regs->omr,
-                 in_be32((void *)&msg_regs->omr) |
+        out_be32(&priv->msg_regs->omr,
+                 in_be32(&priv->msg_regs->omr) |
                  ((get_bitmask_order(entries) - 2) << 12));
 
         /* Now enable the unit */
-        out_be32((void *)&msg_regs->omr, in_be32((void *)&msg_regs->omr) | 0x1);
+        out_be32(&priv->msg_regs->omr, in_be32(&priv->msg_regs->omr) | 0x1);
 
       out:
         return rc;
 
       out_irq:
-        dma_free_coherent(NULL, msg_tx_ring.size * RIO_MSG_DESC_SIZE,
-                          msg_tx_ring.virt, msg_tx_ring.phys);
+        dma_free_coherent(NULL, priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
+                          priv->msg_tx_ring.virt, priv->msg_tx_ring.phys);
 
       out_dma:
-        for (i = 0; i < msg_tx_ring.size; i++)
+        for (i = 0; i < priv->msg_tx_ring.size; i++)
                 dma_free_coherent(NULL, RIO_MSG_BUFFER_SIZE,
-                                  msg_tx_ring.virt_buffer[i],
-                                  msg_tx_ring.phys_buffer[i]);
+                                  priv->msg_tx_ring.virt_buffer[i],
+                                  priv->msg_tx_ring.phys_buffer[i]);
 
         return rc;
 }
@@ -499,19 +566,20 @@ int rio_open_outb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entr
  */
 void rio_close_outb_mbox(struct rio_mport *mport, int mbox)
 {
+        struct rio_priv *priv = mport->priv;
         /* Disable inbound message unit */
-        out_be32((void *)&msg_regs->omr, 0);
+        out_be32(&priv->msg_regs->omr, 0);
 
         /* Free ring */
-        dma_free_coherent(NULL, msg_tx_ring.size * RIO_MSG_DESC_SIZE,
-                          msg_tx_ring.virt, msg_tx_ring.phys);
+        dma_free_coherent(NULL, priv->msg_tx_ring.size * RIO_MSG_DESC_SIZE,
+                          priv->msg_tx_ring.virt, priv->msg_tx_ring.phys);
 
         /* Free interrupt */
-        free_irq(MPC85xx_IRQ_RIO_TX, (void *)mport);
+        free_irq(IRQ_RIO_TX(mport), (void *)mport);
 }
 
 /**
- * mpc85xx_rio_rx_handler - MPC85xx inbound message interrupt handler
+ * fsl_rio_rx_handler - MPC85xx inbound message interrupt handler
  * @irq: Linux interrupt number
  * @dev_instance: Pointer to interrupt-specific data
  *
@@ -519,16 +587,17 @@ void rio_close_outb_mbox(struct rio_mport *mport, int mbox)
  * mailbox event handler and acks the interrupt occurrence.
  */
 static irqreturn_t
-mpc85xx_rio_rx_handler(int irq, void *dev_instance)
+fsl_rio_rx_handler(int irq, void *dev_instance)
 {
         int isr;
         struct rio_mport *port = (struct rio_mport *)dev_instance;
+        struct rio_priv *priv = port->priv;
 
-        isr = in_be32((void *)&msg_regs->isr);
+        isr = in_be32(&priv->msg_regs->isr);
 
         if (isr & RIO_MSG_ISR_TE) {
                 pr_info("RIO: inbound message reception error\n");
-                out_be32((void *)&msg_regs->isr, RIO_MSG_ISR_TE);
+                out_be32((void *)&priv->msg_regs->isr, RIO_MSG_ISR_TE);
                 goto out;
         }
 
@@ -540,10 +609,10 @@ mpc85xx_rio_rx_handler(int irq, void *dev_instance)
                  * make the callback with an unknown/invalid mailbox number
                  * argument.
                  */
-                port->inb_msg[0].mcback(port, msg_rx_ring.dev_id, -1, -1);
+                port->inb_msg[0].mcback(port, priv->msg_rx_ring.dev_id, -1, -1);
 
                 /* Ack the queueing interrupt */
-                out_be32((void *)&msg_regs->isr, RIO_MSG_ISR_DIQI);
+                out_be32(&priv->msg_regs->isr, RIO_MSG_ISR_DIQI);
         }
 
       out:
@@ -564,6 +633,7 @@ mpc85xx_rio_rx_handler(int irq, void *dev_instance)
 int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entries)
 {
         int i, rc = 0;
+        struct rio_priv *priv = mport->priv;
 
         if ((entries < RIO_MIN_RX_RING_SIZE) ||
             (entries > RIO_MAX_RX_RING_SIZE) || (!is_power_of_2(entries))) {
@@ -572,36 +642,35 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri
         }
 
         /* Initialize client buffer ring */
-        msg_rx_ring.dev_id = dev_id;
-        msg_rx_ring.size = entries;
-        msg_rx_ring.rx_slot = 0;
-        for (i = 0; i < msg_rx_ring.size; i++)
-                msg_rx_ring.virt_buffer[i] = NULL;
+        priv->msg_rx_ring.dev_id = dev_id;
+        priv->msg_rx_ring.size = entries;
+        priv->msg_rx_ring.rx_slot = 0;
+        for (i = 0; i < priv->msg_rx_ring.size; i++)
+                priv->msg_rx_ring.virt_buffer[i] = NULL;
 
         /* Initialize inbound message ring */
-        if (!(msg_rx_ring.virt = dma_alloc_coherent(NULL,
-                                                    msg_rx_ring.size *
-                                                    RIO_MAX_MSG_SIZE,
-                                                    &msg_rx_ring.phys,
-                                                    GFP_KERNEL))) {
+        priv->msg_rx_ring.virt = dma_alloc_coherent(NULL,
+                                priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE,
+                                &priv->msg_rx_ring.phys, GFP_KERNEL);
+        if (!priv->msg_rx_ring.virt) {
                 rc = -ENOMEM;
                 goto out;
         }
 
         /* Point dequeue/enqueue pointers at first entry in ring */
-        out_be32((void *)&msg_regs->ifqdpar, (u32) msg_rx_ring.phys);
-        out_be32((void *)&msg_regs->ifqepar, (u32) msg_rx_ring.phys);
+        out_be32(&priv->msg_regs->ifqdpar, (u32) priv->msg_rx_ring.phys);
+        out_be32(&priv->msg_regs->ifqepar, (u32) priv->msg_rx_ring.phys);
 
         /* Clear interrupt status */
-        out_be32((void *)&msg_regs->isr, 0x00000091);
+        out_be32(&priv->msg_regs->isr, 0x00000091);
 
         /* Hook up inbound message handler */
-        if ((rc =
-             request_irq(MPC85xx_IRQ_RIO_RX, mpc85xx_rio_rx_handler, 0,
-                         "msg_rx", (void *)mport)) < 0) {
+        rc = request_irq(IRQ_RIO_RX(mport), fsl_rio_rx_handler, 0,
+                         "msg_rx", (void *)mport);
+        if (rc < 0) {
                 dma_free_coherent(NULL, RIO_MSG_BUFFER_SIZE,
-                                  msg_tx_ring.virt_buffer[i],
-                                  msg_tx_ring.phys_buffer[i]);
+                                  priv->msg_tx_ring.virt_buffer[i],
+                                  priv->msg_tx_ring.phys_buffer[i]);
                 goto out;
         }
 
@@ -612,15 +681,13 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri
          *      Unmask all interrupt sources
          *      Disable
          */
-        out_be32((void *)&msg_regs->imr, 0x001b0060);
+        out_be32(&priv->msg_regs->imr, 0x001b0060);
 
         /* Set number of queue entries */
-        out_be32((void *)&msg_regs->imr,
-                 in_be32((void *)&msg_regs->imr) |
-                 ((get_bitmask_order(entries) - 2) << 12));
+        setbits32(&priv->msg_regs->imr, (get_bitmask_order(entries) - 2) << 12);
 
         /* Now enable the unit */
-        out_be32((void *)&msg_regs->imr, in_be32((void *)&msg_regs->imr) | 0x1);
+        setbits32(&priv->msg_regs->imr, 0x1);
 
       out:
         return rc;
@@ -636,15 +703,16 @@ int rio_open_inb_mbox(struct rio_mport *mport, void *dev_id, int mbox, int entri
  */
 void rio_close_inb_mbox(struct rio_mport *mport, int mbox)
 {
+        struct rio_priv *priv = mport->priv;
         /* Disable inbound message unit */
-        out_be32((void *)&msg_regs->imr, 0);
+        out_be32(&priv->msg_regs->imr, 0);
 
         /* Free ring */
-        dma_free_coherent(NULL, msg_rx_ring.size * RIO_MAX_MSG_SIZE,
-                          msg_rx_ring.virt, msg_rx_ring.phys);
+        dma_free_coherent(NULL, priv->msg_rx_ring.size * RIO_MAX_MSG_SIZE,
+                          priv->msg_rx_ring.virt, priv->msg_rx_ring.phys);
 
         /* Free interrupt */
-        free_irq(MPC85xx_IRQ_RIO_RX, (void *)mport);
+        free_irq(IRQ_RIO_RX(mport), (void *)mport);
 }
 
 /**
@@ -659,21 +727,22 @@ void rio_close_inb_mbox(struct rio_mport *mport, int mbox)
 int rio_hw_add_inb_buffer(struct rio_mport *mport, int mbox, void *buf)
 {
         int rc = 0;
+        struct rio_priv *priv = mport->priv;
 
         pr_debug("RIO: rio_hw_add_inb_buffer(), msg_rx_ring.rx_slot %d\n",
-                 msg_rx_ring.rx_slot);
+                 priv->msg_rx_ring.rx_slot);
 
-        if (msg_rx_ring.virt_buffer[msg_rx_ring.rx_slot]) {
+        if (priv->msg_rx_ring.virt_buffer[priv->msg_rx_ring.rx_slot]) {
                 printk(KERN_ERR
                        "RIO: error adding inbound buffer %d, buffer exists\n",
-                       msg_rx_ring.rx_slot);
+                       priv->msg_rx_ring.rx_slot);
                 rc = -EINVAL;
                 goto out;
         }
 
-        msg_rx_ring.virt_buffer[msg_rx_ring.rx_slot] = buf;
-        if (++msg_rx_ring.rx_slot == msg_rx_ring.size)
-                msg_rx_ring.rx_slot = 0;
+        priv->msg_rx_ring.virt_buffer[priv->msg_rx_ring.rx_slot] = buf;
+        if (++priv->msg_rx_ring.rx_slot == priv->msg_rx_ring.size)
+                priv->msg_rx_ring.rx_slot = 0;
 
       out:
         return rc;
@@ -691,20 +760,21 @@ EXPORT_SYMBOL_GPL(rio_hw_add_inb_buffer);
  */
 void *rio_hw_get_inb_message(struct rio_mport *mport, int mbox)
 {
-        u32 imr;
+        struct rio_priv *priv = mport->priv;
         u32 phys_buf, virt_buf;
         void *buf = NULL;
         int buf_idx;
 
-        phys_buf = in_be32((void *)&msg_regs->ifqdpar);
+        phys_buf = in_be32(&priv->msg_regs->ifqdpar);
 
         /* If no more messages, then bail out */
-        if (phys_buf == in_be32((void *)&msg_regs->ifqepar))
+        if (phys_buf == in_be32(&priv->msg_regs->ifqepar))
                 goto out2;
 
-        virt_buf = (u32) msg_rx_ring.virt + (phys_buf - msg_rx_ring.phys);
-        buf_idx = (phys_buf - msg_rx_ring.phys) / RIO_MAX_MSG_SIZE;
-        buf = msg_rx_ring.virt_buffer[buf_idx];
+        virt_buf = (u32) priv->msg_rx_ring.virt + (phys_buf
+                                                - priv->msg_rx_ring.phys);
+        buf_idx = (phys_buf - priv->msg_rx_ring.phys) / RIO_MAX_MSG_SIZE;
+        buf = priv->msg_rx_ring.virt_buffer[buf_idx];
 
         if (!buf) {
                 printk(KERN_ERR
@@ -716,11 +786,10 @@ void *rio_hw_get_inb_message(struct rio_mport *mport, int mbox)
         memcpy(buf, (void *)virt_buf, RIO_MAX_MSG_SIZE);
 
         /* Clear the available buffer */
-        msg_rx_ring.virt_buffer[buf_idx] = NULL;
+        priv->msg_rx_ring.virt_buffer[buf_idx] = NULL;
 
       out1:
-        imr = in_be32((void *)&msg_regs->imr);
-        out_be32((void *)&msg_regs->imr, imr | RIO_MSG_IMR_MI);
+        setbits32(&priv->msg_regs->imr, RIO_MSG_IMR_MI);
 
       out2:
         return buf;
@@ -729,7 +798,7 @@ void *rio_hw_get_inb_message(struct rio_mport *mport, int mbox)
 EXPORT_SYMBOL_GPL(rio_hw_get_inb_message);
 
 /**
- * mpc85xx_rio_dbell_handler - MPC85xx doorbell interrupt handler
+ * fsl_rio_dbell_handler - MPC85xx doorbell interrupt handler
  * @irq: Linux interrupt number
  * @dev_instance: Pointer to interrupt-specific data
  *
@@ -737,31 +806,31 @@ EXPORT_SYMBOL_GPL(rio_hw_get_inb_message);
  * doorbell event handlers and executes a matching event handler.
  */
 static irqreturn_t
-mpc85xx_rio_dbell_handler(int irq, void *dev_instance)
+fsl_rio_dbell_handler(int irq, void *dev_instance)
 {
         int dsr;
         struct rio_mport *port = (struct rio_mport *)dev_instance;
+        struct rio_priv *priv = port->priv;
 
-        dsr = in_be32((void *)&msg_regs->dsr);
+        dsr = in_be32(&priv->msg_regs->dsr);
 
         if (dsr & DOORBELL_DSR_TE) {
                 pr_info("RIO: doorbell reception error\n");
-                out_be32((void *)&msg_regs->dsr, DOORBELL_DSR_TE);
+                out_be32(&priv->msg_regs->dsr, DOORBELL_DSR_TE);
                 goto out;
         }
 
         if (dsr & DOORBELL_DSR_QFI) {
                 pr_info("RIO: doorbell queue full\n");
-                out_be32((void *)&msg_regs->dsr, DOORBELL_DSR_QFI);
+                out_be32(&priv->msg_regs->dsr, DOORBELL_DSR_QFI);
                 goto out;
         }
 
         /* XXX Need to check/dispatch until queue empty */
         if (dsr & DOORBELL_DSR_DIQI) {
                 u32 dmsg =
-                    (u32) dbell_ring.virt +
-                    (in_be32((void *)&msg_regs->dqdpar) & 0xfff);
-                u32 dmr;
+                    (u32) priv->dbell_ring.virt +
+                    (in_be32(&priv->msg_regs->dqdpar) & 0xfff);
                 struct rio_dbell *dbell;
                 int found = 0;
 
@@ -784,9 +853,8 @@ mpc85xx_rio_dbell_handler(int irq, void *dev_instance)
                             ("RIO: spurious doorbell, sid %2.2x tid %2.2x info %4.4x\n",
                              DBELL_SID(dmsg), DBELL_TID(dmsg), DBELL_INF(dmsg));
                 }
-                dmr = in_be32((void *)&msg_regs->dmr);
-                out_be32((void *)&msg_regs->dmr, dmr | DOORBELL_DMR_DI);
-                out_be32((void *)&msg_regs->dsr, DOORBELL_DSR_DIQI);
+                setbits32(&priv->msg_regs->dmr, DOORBELL_DMR_DI);
+                out_be32(&priv->msg_regs->dsr, DOORBELL_DSR_DIQI);
         }
 
       out:
@@ -794,21 +862,22 @@ mpc85xx_rio_dbell_handler(int irq, void *dev_instance)
 }
 
 /**
- * mpc85xx_rio_doorbell_init - MPC85xx doorbell interface init
+ * fsl_rio_doorbell_init - MPC85xx doorbell interface init
  * @mport: Master port implementing the inbound doorbell unit
  *
  * Initializes doorbell unit hardware and inbound DMA buffer
- * ring. Called from mpc85xx_rio_setup(). Returns %0 on success
+ * ring. Called from fsl_rio_setup(). Returns %0 on success
  * or %-ENOMEM on failure.
  */
-static int mpc85xx_rio_doorbell_init(struct rio_mport *mport)
+static int fsl_rio_doorbell_init(struct rio_mport *mport)
 {
+        struct rio_priv *priv = mport->priv;
         int rc = 0;
 
         /* Map outbound doorbell window immediately after maintenance window */
-        if (!(dbell_win =
-              (u32) ioremap(mport->iores.start + RIO_MAINT_WIN_SIZE,
-                            RIO_DBELL_WIN_SIZE))) {
+        priv->dbell_win = ioremap(mport->iores.start + RIO_MAINT_WIN_SIZE,
+                            RIO_DBELL_WIN_SIZE);
+        if (!priv->dbell_win) {
                 printk(KERN_ERR
                        "RIO: unable to map outbound doorbell window\n");
                 rc = -ENOMEM;
@@ -816,37 +885,36 @@ static int mpc85xx_rio_doorbell_init(struct rio_mport *mport)
         }
 
         /* Initialize inbound doorbells */
-        if (!(dbell_ring.virt = dma_alloc_coherent(NULL,
-                                                   512 * DOORBELL_MESSAGE_SIZE,
-                                                   &dbell_ring.phys,
-                                                   GFP_KERNEL))) {
+        priv->dbell_ring.virt = dma_alloc_coherent(NULL, 512 *
+                    DOORBELL_MESSAGE_SIZE, &priv->dbell_ring.phys, GFP_KERNEL);
+        if (!priv->dbell_ring.virt) {
                 printk(KERN_ERR "RIO: unable allocate inbound doorbell ring\n");
                 rc = -ENOMEM;
-                iounmap((void *)dbell_win);
+                iounmap(priv->dbell_win);
                 goto out;
         }
 
         /* Point dequeue/enqueue pointers at first entry in ring */
-        out_be32((void *)&msg_regs->dqdpar, (u32) dbell_ring.phys);
-        out_be32((void *)&msg_regs->dqepar, (u32) dbell_ring.phys);
+        out_be32(&priv->msg_regs->dqdpar, (u32) priv->dbell_ring.phys);
+        out_be32(&priv->msg_regs->dqepar, (u32) priv->dbell_ring.phys);
 
         /* Clear interrupt status */
-        out_be32((void *)&msg_regs->dsr, 0x00000091);
+        out_be32(&priv->msg_regs->dsr, 0x00000091);
 
         /* Hook up doorbell handler */
-        if ((rc =
-             request_irq(MPC85xx_IRQ_RIO_BELL, mpc85xx_rio_dbell_handler, 0,
-                         "dbell_rx", (void *)mport) < 0)) {
-                iounmap((void *)dbell_win);
+        rc = request_irq(IRQ_RIO_BELL(mport), fsl_rio_dbell_handler, 0,
+                         "dbell_rx", (void *)mport);
+        if (rc < 0) {
+                iounmap(priv->dbell_win);
                 dma_free_coherent(NULL, 512 * DOORBELL_MESSAGE_SIZE,
-                                  dbell_ring.virt, dbell_ring.phys);
+                                  priv->dbell_ring.virt, priv->dbell_ring.phys);
                 printk(KERN_ERR
                        "MPC85xx RIO: unable to request inbound doorbell irq");
                 goto out;
         }
 
         /* Configure doorbells for snooping, 512 entries, and enable */
-        out_be32((void *)&msg_regs->dmr, 0x00108161);
+        out_be32(&priv->msg_regs->dmr, 0x00108161);
 
       out:
         return rc;
@@ -854,7 +922,7 @@ static int mpc85xx_rio_doorbell_init(struct rio_mport *mport)
 
 static char *cmdline = NULL;
 
-static int mpc85xx_rio_get_hdid(int index)
+static int fsl_rio_get_hdid(int index)
 {
         /* XXX Need to parse multiple entries in some format */
         if (!cmdline)
@@ -863,7 +931,7 @@ static int mpc85xx_rio_get_hdid(int index)
         return simple_strtol(cmdline, NULL, 0);
 }
 
-static int mpc85xx_rio_get_cmdline(char *s)
+static int fsl_rio_get_cmdline(char *s)
 {
         if (!s)
                 return 0;
@@ -872,61 +940,266 @@ static int mpc85xx_rio_get_cmdline(char *s)
         return 1;
 }
 
-__setup("riohdid=", mpc85xx_rio_get_cmdline);
+__setup("riohdid=", fsl_rio_get_cmdline);
+
+static inline void fsl_rio_info(struct device *dev, u32 ccsr)
+{
+        const char *str;
+        if (ccsr & 1) {
+                /* Serial phy */
+                switch (ccsr >> 30) {
+                case 0:
+                        str = "1";
+                        break;
+                case 1:
+                        str = "4";
+                        break;
+                default:
+                        str = "Unknown";
+                        break;;
+                }
+                dev_info(dev, "Hardware port width: %s\n", str);
+
+                switch ((ccsr >> 27) & 7) {
+                case 0:
+                        str = "Single-lane 0";
+                        break;
+                case 1:
+                        str = "Single-lane 2";
+                        break;
+                case 2:
+                        str = "Four-lane";
+                        break;
+                default:
+                        str = "Unknown";
+                        break;
+                }
+                dev_info(dev, "Training connection status: %s\n", str);
+        } else {
+                /* Parallel phy */
+                if (!(ccsr & 0x80000000))
+                        dev_info(dev, "Output port operating in 8-bit mode\n");
+                if (!(ccsr & 0x08000000))
+                        dev_info(dev, "Input port operating in 8-bit mode\n");
+        }
+}
 
 /**
- * mpc85xx_rio_setup - Setup MPC85xx RapidIO interface
- * @law_start: Starting physical address of RapidIO LAW
- * @law_size: Size of RapidIO LAW
+ * fsl_rio_setup - Setup MPC85xx RapidIO interface
+ * @fsl_rio_setup - Setup Freescale PowerPC RapidIO interface
  *
  * Initializes MPC85xx RapidIO hardware interface, configures
  * master port with system-specific info, and registers the
  * master port with the RapidIO subsystem.
  */
-void mpc85xx_rio_setup(int law_start, int law_size)
+int fsl_rio_setup(struct of_device *dev)
 {
         struct rio_ops *ops;
         struct rio_mport *port;
+        struct rio_priv *priv;
+        int rc = 0;
+        const u32 *dt_range, *cell;
+        struct resource regs;
+        int rlen;
+        u32 ccsr;
+        u64 law_start, law_size;
+        int paw, aw, sw;
+
+        if (!dev->node) {
+                dev_err(&dev->dev, "Device OF-Node is NULL");
+                return -EFAULT;
+        }
+
+        rc = of_address_to_resource(dev->node, 0, &regs);
+        if (rc) {
+                dev_err(&dev->dev, "Can't get %s property 'reg'\n",
+                                dev->node->full_name);
+                return -EFAULT;
+        }
+        dev_info(&dev->dev, "Of-device full name %s\n", dev->node->full_name);
+        dev_info(&dev->dev, "Regs start 0x%08x size 0x%08x\n",  regs.start,
+                                                regs.end - regs.start + 1);
+
+        dt_range = of_get_property(dev->node, "ranges", &rlen);
+        if (!dt_range) {
+                dev_err(&dev->dev, "Can't get %s property 'ranges'\n",
+                                dev->node->full_name);
+                return -EFAULT;
+        }
+
+        /* Get node address wide */
+        cell = of_get_property(dev->node, "#address-cells", NULL);
+        if (cell)
+                aw = *cell;
+        else
+                aw = of_n_addr_cells(dev->node);
+        /* Get node size wide */
+        cell = of_get_property(dev->node, "#size-cells", NULL);
+        if (cell)
+                sw = *cell;
+        else
+                sw = of_n_size_cells(dev->node);
+        /* Get parent address wide wide */
+        paw = of_n_addr_cells(dev->node);
+
+        law_start = of_read_number(dt_range + aw, paw);
+        law_size = of_read_number(dt_range + aw + paw, sw);
+
+        dev_info(&dev->dev, "LAW start 0x%016llx, size 0x%016llx.\n",
+                        law_start, law_size);
 
         ops = kmalloc(sizeof(struct rio_ops), GFP_KERNEL);
-        ops->lcread = mpc85xx_local_config_read;
-        ops->lcwrite = mpc85xx_local_config_write;
-        ops->cread = mpc85xx_rio_config_read;
-        ops->cwrite = mpc85xx_rio_config_write;
-        ops->dsend = mpc85xx_rio_doorbell_send;
+        ops->lcread = fsl_local_config_read;
+        ops->lcwrite = fsl_local_config_write;
+        ops->cread = fsl_rio_config_read;
+        ops->cwrite = fsl_rio_config_write;
+        ops->dsend = fsl_rio_doorbell_send;
 
-        port = kmalloc(sizeof(struct rio_mport), GFP_KERNEL);
+        port = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);
         port->id = 0;
         port->index = 0;
+
+        priv = kzalloc(sizeof(struct rio_priv), GFP_KERNEL);
+        if (!priv) {
+                printk(KERN_ERR "Can't alloc memory for 'priv'\n");
+                rc = -ENOMEM;
+                goto err;
+        }
+
         INIT_LIST_HEAD(&port->dbells);
         port->iores.start = law_start;
         port->iores.end = law_start + law_size;
         port->iores.flags = IORESOURCE_MEM;
 
+        priv->bellirq = irq_of_parse_and_map(dev->node, 2);
+        priv->txirq = irq_of_parse_and_map(dev->node, 3);
+        priv->rxirq = irq_of_parse_and_map(dev->node, 4);
+        dev_info(&dev->dev, "bellirq: %d, txirq: %d, rxirq %d\n", priv->bellirq,
+                                priv->txirq, priv->rxirq);
+
         rio_init_dbell_res(&port->riores[RIO_DOORBELL_RESOURCE], 0, 0xffff);
         rio_init_mbox_res(&port->riores[RIO_INB_MBOX_RESOURCE], 0, 0);
         rio_init_mbox_res(&port->riores[RIO_OUTB_MBOX_RESOURCE], 0, 0);
         strcpy(port->name, "RIO0 mport");
 
         port->ops = ops;
-        port->host_deviceid = mpc85xx_rio_get_hdid(port->id);
+        port->host_deviceid = fsl_rio_get_hdid(port->id);
 
+        port->priv = priv;
         rio_register_mport(port);
 
-        regs_win = (u32) ioremap(RIO_REGS_BASE, 0x20000);
-        atmu_regs = (struct rio_atmu_regs *)(regs_win + RIO_ATMU_REGS_OFFSET);
-        maint_atmu_regs = atmu_regs + 1;
-        dbell_atmu_regs = atmu_regs + 2;
-        msg_regs = (struct rio_msg_regs *)(regs_win + RIO_MSG_REGS_OFFSET);
+        priv->regs_win = ioremap(regs.start, regs.end - regs.start + 1);
+
+        /* Probe the master port phy type */
+        ccsr = in_be32(priv->regs_win + RIO_CCSR);
+        port->phy_type = (ccsr & 1) ? RIO_PHY_SERIAL : RIO_PHY_PARALLEL;
+        dev_info(&dev->dev, "RapidIO PHY type: %s\n",
+                        (port->phy_type == RIO_PHY_PARALLEL) ? "parallel" :
+                        ((port->phy_type == RIO_PHY_SERIAL) ? "serial" :
+                         "unknown"));
+        /* Checking the port training status */
+        if (in_be32((priv->regs_win + RIO_ESCSR)) & 1) {
+                dev_err(&dev->dev, "Port is not ready. "
+                                   "Try to restart connection...\n");
+                switch (port->phy_type) {
+                case RIO_PHY_SERIAL:
+                        /* Disable ports */
+                        out_be32(priv->regs_win + RIO_CCSR, 0);
+                        /* Set 1x lane */
+                        setbits32(priv->regs_win + RIO_CCSR, 0x02000000);
+                        /* Enable ports */
+                        setbits32(priv->regs_win + RIO_CCSR, 0x00600000);
+                        break;
+                case RIO_PHY_PARALLEL:
+                        /* Disable ports */
+                        out_be32(priv->regs_win + RIO_CCSR, 0x22000000);
+                        /* Enable ports */
+                        out_be32(priv->regs_win + RIO_CCSR, 0x44000000);
+                        break;
+                }
+                msleep(100);
+                if (in_be32((priv->regs_win + RIO_ESCSR)) & 1) {
+                        dev_err(&dev->dev, "Port restart failed.\n");
+                        rc = -ENOLINK;
+                        goto err;
+                }
+                dev_info(&dev->dev, "Port restart success!\n");
+        }
+        fsl_rio_info(&dev->dev, ccsr);
+
+        port->sys_size = (in_be32((priv->regs_win + RIO_PEF_CAR))
+                                        & RIO_PEF_CTLS) >> 4;
+        dev_info(&dev->dev, "RapidIO Common Transport System size: %d\n",
+                        port->sys_size ? 65536 : 256);
+
+        priv->atmu_regs = (struct rio_atmu_regs *)(priv->regs_win
+                                        + RIO_ATMU_REGS_OFFSET);
+        priv->maint_atmu_regs = priv->atmu_regs + 1;
+        priv->dbell_atmu_regs = priv->atmu_regs + 2;
+        priv->msg_regs = (struct rio_msg_regs *)(priv->regs_win +
+                                ((port->phy_type == RIO_PHY_SERIAL) ?
+                                RIO_S_MSG_REGS_OFFSET : RIO_P_MSG_REGS_OFFSET));
+
+        /* Set to receive any dist ID for serial RapidIO controller. */
+        if (port->phy_type == RIO_PHY_SERIAL)
+                out_be32((priv->regs_win + RIO_ISR_AACR), RIO_ISR_AACR_AA);
 
         /* Configure maintenance transaction window */
-        out_be32((void *)&maint_atmu_regs->rowbar, 0x000c0000);
-        out_be32((void *)&maint_atmu_regs->rowar, 0x80077015);
+        out_be32(&priv->maint_atmu_regs->rowbar, 0x000c0000);
+        out_be32(&priv->maint_atmu_regs->rowar, 0x80077015);
 
-        maint_win = (u32) ioremap(law_start, RIO_MAINT_WIN_SIZE);
+        priv->maint_win = ioremap(law_start, RIO_MAINT_WIN_SIZE);
 
         /* Configure outbound doorbell window */
-        out_be32((void *)&dbell_atmu_regs->rowbar, 0x000c0400);
-        out_be32((void *)&dbell_atmu_regs->rowar, 0x8004200b);
-        mpc85xx_rio_doorbell_init(port);
+        out_be32(&priv->dbell_atmu_regs->rowbar, 0x000c0400);
+        out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b);
+        fsl_rio_doorbell_init(port);
+
+        return 0;
+err:
+        if (priv)
+                iounmap(priv->regs_win);
+        kfree(ops);
+        kfree(priv);
+        kfree(port);
+        return rc;
+}
+
+/* The probe function for RapidIO peer-to-peer network.
+ */
+static int __devinit fsl_of_rio_rpn_probe(struct of_device *dev,
+                                     const struct of_device_id *match)
+{
+        int rc;
+        printk(KERN_INFO "Setting up RapidIO peer-to-peer network %s\n",
+                        dev->node->full_name);
+
+        rc = fsl_rio_setup(dev);
+        if (rc)
+                goto out;
+
+        /* Enumerate all registered ports */
+        rc = rio_init_mports();
+out:
+        return rc;
+};
+
+static const struct of_device_id fsl_of_rio_rpn_ids[] = {
+        {
+                .compatible = "fsl,rapidio-delta",
+        },
+        {},
+};
+
+static struct of_platform_driver fsl_of_rio_rpn_driver = {
+        .name = "fsl-of-rio",
+        .match_table = fsl_of_rio_rpn_ids,
+        .probe = fsl_of_rio_rpn_probe,
+};
+
+static __init int fsl_of_rio_rpn_init(void)
+{
+        return of_register_platform_driver(&fsl_of_rio_rpn_driver);
 }
+
+subsys_initcall(fsl_of_rio_rpn_init);
diff --git a/arch/powerpc/sysdev/fsl_rio.h b/arch/powerpc/sysdev/fsl_rio.h
deleted file mode 100644
index 6d3ff30b1579..000000000000
--- a/arch/powerpc/sysdev/fsl_rio.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * MPC85xx RapidIO definitions
- *
- * Copyright 2005 MontaVista Software, Inc.
- * Matt Porter <mporter@kernel.crashing.org>
- *
- * 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.
- */
-
-#ifndef __PPC_SYSLIB_PPC85XX_RIO_H
-#define __PPC_SYSLIB_PPC85XX_RIO_H
-
-#include <linux/init.h>
-
-extern void mpc85xx_rio_setup(int law_start, int law_size);
-
-#endif                          /* __PPC_SYSLIB_PPC85XX_RIO_H */
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 7b45670c7af3..324c01b70ddd 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -418,22 +418,21 @@ arch_initcall(gfar_of_init);
 #include <linux/i2c.h>
 struct i2c_driver_device {
         char    *of_device;
-        char    *i2c_driver;
         char    *i2c_type;
 };
 
 static struct i2c_driver_device i2c_devices[] __initdata = {
-        {"ricoh,rs5c372a", "rtc-rs5c372", "rs5c372a",},
-        {"ricoh,rs5c372b", "rtc-rs5c372", "rs5c372b",},
-        {"ricoh,rv5c386",  "rtc-rs5c372", "rv5c386",},
-        {"ricoh,rv5c387a", "rtc-rs5c372", "rv5c387a",},
-        {"dallas,ds1307",  "rtc-ds1307",  "ds1307",},
-        {"dallas,ds1337",  "rtc-ds1307",  "ds1337",},
-        {"dallas,ds1338",  "rtc-ds1307",  "ds1338",},
-        {"dallas,ds1339",  "rtc-ds1307",  "ds1339",},
-        {"dallas,ds1340",  "rtc-ds1307",  "ds1340",},
-        {"stm,m41t00",     "rtc-ds1307",  "m41t00"},
-        {"dallas,ds1374",  "rtc-ds1374",  "rtc-ds1374",},
+        {"ricoh,rs5c372a", "rs5c372a"},
+        {"ricoh,rs5c372b", "rs5c372b"},
+        {"ricoh,rv5c386",  "rv5c386"},
+        {"ricoh,rv5c387a", "rv5c387a"},
+        {"dallas,ds1307",  "ds1307"},
+        {"dallas,ds1337",  "ds1337"},
+        {"dallas,ds1338",  "ds1338"},
+        {"dallas,ds1339",  "ds1339"},
+        {"dallas,ds1340",  "ds1340"},
+        {"stm,m41t00",     "m41t00"},
+        {"dallas,ds1374",  "rtc-ds1374"},
 };
 
 static int __init of_find_i2c_driver(struct device_node *node,
@@ -444,9 +443,7 @@ static int __init of_find_i2c_driver(struct device_node *node,
         for (i = 0; i < ARRAY_SIZE(i2c_devices); i++) {
                 if (!of_device_is_compatible(node, i2c_devices[i].of_device))
                         continue;
-                if (strlcpy(info->driver_name, i2c_devices[i].i2c_driver,
-                            KOBJ_NAME_LEN) >= KOBJ_NAME_LEN ||
-                    strlcpy(info->type, i2c_devices[i].i2c_type,
+                if (strlcpy(info->type, i2c_devices[i].i2c_type,
                             I2C_NAME_SIZE) >= I2C_NAME_SIZE)
                         return -ENOMEM;
                 return 0;