leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/fsl_rio: use LAW address from device tree

Browse Source 
Instead of fixed address in old code.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Li Yang
2009-05-12 16:35:59 +08:00
committed by Kumar Gala
parent fc274a1569
commit 186e74b9c5
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/powerpc/sysdev/fsl_rio.c
View File

@@ -1076,8 +1076,9 @@ int fsl_rio_setup(struct of_device *dev)
INIT_LIST_HEAD(&port->dbells); INIT_LIST_HEAD(&port->dbells);
port->iores.start = law_start; 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.flags = IORESOURCE_MEM;
port->iores.name = "rio_io_win";
priv->bellirq = irq_of_parse_and_map(dev->node, 2); priv->bellirq = irq_of_parse_and_map(dev->node, 2);
priv->txirq = irq_of_parse_and_map(dev->node, 3); 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); out_be32((priv->regs_win + RIO_ISR_AACR), RIO_ISR_AACR_AA);
/* Configure maintenance transaction window */ /* Configure maintenance transaction window */
out_be32(&priv->maint_atmu_regs->rowbar, 0x000c0000); out_be32(&priv->maint_atmu_regs->rowbar, law_start >> 12);
out_be32(&priv->maint_atmu_regs->rowar, 0x80077015); out_be32(&priv->maint_atmu_regs->rowar, 0x80077015); /* 4M */
priv->maint_win = ioremap(law_start, RIO_MAINT_WIN_SIZE); priv->maint_win = ioremap(law_start, RIO_MAINT_WIN_SIZE);
/* Configure outbound doorbell window */ /* Configure outbound doorbell window */
out_be32(&priv->dbell_atmu_regs->rowbar, 0x000c0400); out_be32(&priv->dbell_atmu_regs->rowbar,
out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b); (law_start + RIO_MAINT_WIN_SIZE) >> 12);
out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b); /* 4k */
fsl_rio_doorbell_init(port); fsl_rio_doorbell_init(port);
return 0; return 0;