diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 03:14:29 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-20 03:14:29 -0400 |
commit | a3c0e0d0032d5bbfd7dc04827a257c717d432a5b (patch) | |
tree | ba853dce3346b33c44cd4d224ca662632186594e /arch/sh/boards | |
parent | 9833385131fc4e8c52f95320ab899051d1c06831 (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')
-rw-r--r-- | arch/sh/boards/mach-se/7751/pci.c | 9 |
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 203b2923fe7f..9ec64a416b30 100644 --- a/arch/sh/boards/mach-se/7751/pci.c +++ b/arch/sh/boards/mach-se/7751/pci.c | |||
@@ -30,6 +30,9 @@ | |||
30 | #define PCIC_WRITE(x,v) writel((v), PCI_REG(x)) | 30 | #define PCIC_WRITE(x,v) writel((v), PCI_REG(x)) |
31 | #define PCIC_READ(x) readl(PCI_REG(x)) | 31 | #define PCIC_READ(x) readl(PCI_REG(x)) |
32 | 32 | ||
33 | #define xPCIBIOS_MIN_IO board_pci_channels->io_resource->start | ||
34 | #define xPCIBIOS_MIN_MEM board_pci_channels->mem_resource->start | ||
35 | |||
33 | /* | 36 | /* |
34 | * Description: This function sets up and initializes the pcic, sets | 37 | * Description: This function sets up and initializes the pcic, sets |
35 | * up the BARS, maps the DRAM into the address space etc, etc. | 38 | * up the BARS, maps the DRAM into the address space etc, etc. |
@@ -97,12 +100,12 @@ int __init pcibios_init_platform(void) | |||
97 | * meaning all calls go straight through... use BUG_ON to | 100 | * meaning all calls go straight through... use BUG_ON to |
98 | * catch erroneous assumption. | 101 | * catch erroneous assumption. |
99 | */ | 102 | */ |
100 | BUG_ON(PCIBIOS_MIN_MEM != SH7751_PCI_MEMORY_BASE); | 103 | BUG_ON(xPCIBIOS_MIN_MEM != SH7751_PCI_MEMORY_BASE); |
101 | 104 | ||
102 | PCIC_WRITE(SH7751_PCIMBR, PCIBIOS_MIN_MEM); | 105 | PCIC_WRITE(SH7751_PCIMBR, xPCIBIOS_MIN_MEM); |
103 | 106 | ||
104 | /* Set IOBR for window containing area specified in pci.h */ | 107 | /* Set IOBR for window containing area specified in pci.h */ |
105 | PCIC_WRITE(SH7751_PCIIOBR, (PCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK)); | 108 | PCIC_WRITE(SH7751_PCIIOBR, (xPCIBIOS_MIN_IO & SH7751_PCIIOBR_MASK)); |
106 | 109 | ||
107 | /* All done, may as well say so... */ | 110 | /* All done, may as well say so... */ |
108 | printk("SH7751 PCI: Finished initialization of the PCI controller\n"); | 111 | printk("SH7751 PCI: Finished initialization of the PCI controller\n"); |