aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/boards/mach-se
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-04-20 16:14:29 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-04-20 16:14:29 +0900
commita3c0e0d0032d5bbfd7dc04827a257c717d432a5b (patch)
treeba853dce3346b33c44cd4d224ca662632186594e /arch/sh/boards/mach-se
parent9833385131fc4e8c52f95320ab899051d1c06831 (diff)
sh: pci: Consolidate pcibios_align_resource() definitions.
This introduces a saner pcibios_align_resource() that can be used regardless of whether pci-auto or pci-new are being used, and consolidates it in pci-lib.c. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-se')
-rw-r--r--arch/sh/boards/mach-se/7751/pci.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/sh/boards/mach-se/7751/pci.c b/arch/sh/boards/mach-se/7751/pci.c
index 203b2923fe7..9ec64a416b3 100644
--- a/arch/sh/boards/mach-se/7751/pci.c
+++ b/arch/sh/boards/mach-se/7751/pci.c
@@ -30,6 +30,9 @@
#define PCIC_WRITE(x,v) writel((v), PCI_REG(x))
#define PCIC_READ(x) readl(PCI_REG(x))
+#define xPCIBIOS_MIN_IO board_pci_channels->io_resource->start
+#define xPCIBIOS_MIN_MEM board_pci_channels->mem_resource->start
+
/*
* Description: This function sets up and initializes the pcic, sets
* up the BARS, maps the DRAM into the address space etc, etc.
@@ -97,12 +100,12 @@ int __init pcibios_init_platform(void)
* meaning all calls go straight through... use BUG_ON to
* catch erroneous assumption.
*/
- BUG_ON(PCIBIOS_MIN_MEM != SH7751_PCI_MEMORY_BASE);
+ BUG_ON(xPCIBIOS_MIN_MEM != SH7751_PCI_MEMORY_BASE);
- PCIC_WRITE(SH7751_PCIMBR, PCIBIOS_MIN_MEM);
+ PCIC_WRITE(SH7751_PCIMBR, xPCIBIOS_MIN_MEM);
/* Set IOBR for window containing area specified in pci.h */
- PCIC_WRITE(SH7751_PCIIOBR, (PCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK));
+ PCIC_WRITE(SH7751_PCIIOBR, (xPCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK));
/* All done, may as well say so... */
printk("SH7751 PCI: Finished initialization of the PCI controller\n");