aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pci/pci-xlr.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/pci/pci-xlr.c')
-rw-r--r--arch/mips/pci/pci-xlr.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/arch/mips/pci/pci-xlr.c b/arch/mips/pci/pci-xlr.c
index 0c18ccc79623..4427abbd48b5 100644
--- a/arch/mips/pci/pci-xlr.c
+++ b/arch/mips/pci/pci-xlr.c
@@ -56,7 +56,7 @@
56 56
57static void *pci_config_base; 57static void *pci_config_base;
58 58
59#define pci_cfg_addr(bus, devfn, off) (((bus) << 16) | ((devfn) << 8) | (off)) 59#define pci_cfg_addr(bus, devfn, off) (((bus) << 16) | ((devfn) << 8) | (off))
60 60
61/* PCI ops */ 61/* PCI ops */
62static inline u32 pci_cfg_read_32bit(struct pci_bus *bus, unsigned int devfn, 62static inline u32 pci_cfg_read_32bit(struct pci_bus *bus, unsigned int devfn,
@@ -136,26 +136,26 @@ struct pci_ops nlm_pci_ops = {
136}; 136};
137 137
138static struct resource nlm_pci_mem_resource = { 138static struct resource nlm_pci_mem_resource = {
139 .name = "XLR PCI MEM", 139 .name = "XLR PCI MEM",
140 .start = 0xd0000000UL, /* 256MB PCI mem @ 0xd000_0000 */ 140 .start = 0xd0000000UL, /* 256MB PCI mem @ 0xd000_0000 */
141 .end = 0xdfffffffUL, 141 .end = 0xdfffffffUL,
142 .flags = IORESOURCE_MEM, 142 .flags = IORESOURCE_MEM,
143}; 143};
144 144
145static struct resource nlm_pci_io_resource = { 145static struct resource nlm_pci_io_resource = {
146 .name = "XLR IO MEM", 146 .name = "XLR IO MEM",
147 .start = 0x10000000UL, /* 16MB PCI IO @ 0x1000_0000 */ 147 .start = 0x10000000UL, /* 16MB PCI IO @ 0x1000_0000 */
148 .end = 0x100fffffUL, 148 .end = 0x100fffffUL,
149 .flags = IORESOURCE_IO, 149 .flags = IORESOURCE_IO,
150}; 150};
151 151
152struct pci_controller nlm_pci_controller = { 152struct pci_controller nlm_pci_controller = {
153 .index = 0, 153 .index = 0,
154 .pci_ops = &nlm_pci_ops, 154 .pci_ops = &nlm_pci_ops,
155 .mem_resource = &nlm_pci_mem_resource, 155 .mem_resource = &nlm_pci_mem_resource,
156 .mem_offset = 0x00000000UL, 156 .mem_offset = 0x00000000UL,
157 .io_resource = &nlm_pci_io_resource, 157 .io_resource = &nlm_pci_io_resource,
158 .io_offset = 0x00000000UL, 158 .io_offset = 0x00000000UL,
159}; 159};
160 160
161/* 161/*
@@ -259,7 +259,7 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc)
259 MSI_ADDR_REDIRECTION_CPU; 259 MSI_ADDR_REDIRECTION_CPU;
260 260
261 msg.data = MSI_DATA_TRIGGER_EDGE | 261 msg.data = MSI_DATA_TRIGGER_EDGE |
262 MSI_DATA_LEVEL_ASSERT | 262 MSI_DATA_LEVEL_ASSERT |
263 MSI_DATA_DELIVERY_FIXED; 263 MSI_DATA_DELIVERY_FIXED;
264 264
265 ret = irq_set_msi_desc(irq, desc); 265 ret = irq_set_msi_desc(irq, desc);
@@ -344,7 +344,7 @@ static int __init pcibios_init(void)
344 pci_config_base = ioremap(DEFAULT_PCI_CONFIG_BASE, 16 << 20); 344 pci_config_base = ioremap(DEFAULT_PCI_CONFIG_BASE, 16 << 20);
345 345
346 /* Extend IO port for memory mapped io */ 346 /* Extend IO port for memory mapped io */
347 ioport_resource.start = 0; 347 ioport_resource.start = 0;
348 ioport_resource.end = ~0; 348 ioport_resource.end = ~0;
349 349
350 set_io_port_base(CKSEG1); 350 set_io_port_base(CKSEG1);