aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/drivers/pci/pci-sh5.c
diff options
context:
space:
mode:
authorMagnus Damm <damm@igel.co.jp>2009-03-11 15:47:23 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-16 16:00:13 +0900
commit710fa3c81151948ac4d836ef52b57cef91b0ab72 (patch)
tree57718b3badc0817db419dce57716973a3faa0f1e /arch/sh/drivers/pci/pci-sh5.c
parentsh: add init member to pci_channel data (diff)
downloadlinux-dev-710fa3c81151948ac4d836ef52b57cef91b0ab72.tar.xz
linux-dev-710fa3c81151948ac4d836ef52b57cef91b0ab72.zip
sh: avoid using PCIBIOS_MIN_xxx
Replaces PCIBIOS_MIN_IO and PCIBIOS_MIN_MEM with direct struct pci_channel access. This allows us to have more than one pci channel. Signed-off-by: Magnus Damm <damm@igel.co.jp> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers/pci/pci-sh5.c')
-rw-r--r--arch/sh/drivers/pci/pci-sh5.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/sh/drivers/pci/pci-sh5.c b/arch/sh/drivers/pci/pci-sh5.c
index 008a02ec0d9f..7750da276284 100644
--- a/arch/sh/drivers/pci/pci-sh5.c
+++ b/arch/sh/drivers/pci/pci-sh5.c
@@ -206,6 +206,9 @@ int __init sh5pci_init(unsigned long memStart, unsigned long memSize)
return 0;
}
+#define xPCIBIOS_MIN_IO board_pci_channels->io_resource->start
+#define xPCIBIOS_MIN_MEM board_pci_channels->mem_resource->start
+
void __devinit pcibios_fixup_bus(struct pci_bus *bus)
{
struct pci_dev *dev = bus->self;
@@ -223,9 +226,9 @@ void __devinit pcibios_fixup_bus(struct pci_bus *bus)
/* For now, propagate host limits to the bus;
* we'll adjust them later. */
bus->resource[0]->end = 64*1024 - 1 ;
- bus->resource[1]->end = PCIBIOS_MIN_MEM+(256*1024*1024)-1;
- bus->resource[0]->start = PCIBIOS_MIN_IO;
- bus->resource[1]->start = PCIBIOS_MIN_MEM;
+ bus->resource[1]->end = xPCIBIOS_MIN_MEM+(256*1024*1024)-1;
+ bus->resource[0]->start = xPCIBIOS_MIN_IO;
+ bus->resource[1]->start = xPCIBIOS_MIN_MEM;
/* Turn off downstream PF memory address range by default */
bus->resource[2]->start = 1024*1024;