powerpc/fsl_rio: use LAW address from device tree

Instead of fixed address in old code.

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

1 files changed, 7 insertions, 5 deletions

diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index c5aa179fceb7..39db9d1155d2 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1076,8 +1076,9 @@ int fsl_rio_setup(struct of_device *dev)
 
         INIT_LIST_HEAD(&port->dbells);
         port->iores.start = law_start;
-        port->iores.end = law_start + law_size;
+        port->iores.end = law_start + law_size - 1;
         port->iores.flags = IORESOURCE_MEM;
+        port->iores.name = "rio_io_win";
 
         priv->bellirq = irq_of_parse_and_map(dev->node, 2);
         priv->txirq = irq_of_parse_and_map(dev->node, 3);
@@ -1155,14 +1156,15 @@ int fsl_rio_setup(struct of_device *dev)
                 out_be32((priv->regs_win + RIO_ISR_AACR), RIO_ISR_AACR_AA);
 
         /* Configure maintenance transaction window */
-        out_be32(&priv->maint_atmu_regs->rowbar, 0x000c0000);
-        out_be32(&priv->maint_atmu_regs->rowar, 0x80077015);
+        out_be32(&priv->maint_atmu_regs->rowbar, law_start >> 12);
+        out_be32(&priv->maint_atmu_regs->rowar, 0x80077015);    /* 4M */
 
         priv->maint_win = ioremap(law_start, RIO_MAINT_WIN_SIZE);
 
         /* Configure outbound doorbell window */
-        out_be32(&priv->dbell_atmu_regs->rowbar, 0x000c0400);
-        out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b);
+        out_be32(&priv->dbell_atmu_regs->rowbar,
+                        (law_start + RIO_MAINT_WIN_SIZE) >> 12);
+        out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b);    /* 4k */
         fsl_rio_doorbell_init(port);
 
         return 0;