diff options
Diffstat (limited to 'arch/mips/pci/pci-octeon.c')
-rw-r--r-- | arch/mips/pci/pci-octeon.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index a04af55d89f1..c258cd406fbb 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c | |||
@@ -214,6 +214,8 @@ const char *octeon_get_pci_interrupts(void) | |||
214 | return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; | 214 | return "AAABAAAAAAAAAAAAAAAAAAAAAAAAAAAA"; |
215 | case CVMX_BOARD_TYPE_BBGW_REF: | 215 | case CVMX_BOARD_TYPE_BBGW_REF: |
216 | return "AABCD"; | 216 | return "AABCD"; |
217 | case CVMX_BOARD_TYPE_CUST_DSR1000N: | ||
218 | return "CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC"; | ||
217 | case CVMX_BOARD_TYPE_THUNDER: | 219 | case CVMX_BOARD_TYPE_THUNDER: |
218 | case CVMX_BOARD_TYPE_EBH3000: | 220 | case CVMX_BOARD_TYPE_EBH3000: |
219 | default: | 221 | default: |
@@ -271,9 +273,6 @@ static int octeon_read_config(struct pci_bus *bus, unsigned int devfn, | |||
271 | pci_addr.s.func = devfn & 0x7; | 273 | pci_addr.s.func = devfn & 0x7; |
272 | pci_addr.s.reg = reg; | 274 | pci_addr.s.reg = reg; |
273 | 275 | ||
274 | #if PCI_CONFIG_SPACE_DELAY | ||
275 | udelay(PCI_CONFIG_SPACE_DELAY); | ||
276 | #endif | ||
277 | switch (size) { | 276 | switch (size) { |
278 | case 4: | 277 | case 4: |
279 | *val = le32_to_cpu(cvmx_read64_uint32(pci_addr.u64)); | 278 | *val = le32_to_cpu(cvmx_read64_uint32(pci_addr.u64)); |
@@ -308,9 +307,6 @@ static int octeon_write_config(struct pci_bus *bus, unsigned int devfn, | |||
308 | pci_addr.s.func = devfn & 0x7; | 307 | pci_addr.s.func = devfn & 0x7; |
309 | pci_addr.s.reg = reg; | 308 | pci_addr.s.reg = reg; |
310 | 309 | ||
311 | #if PCI_CONFIG_SPACE_DELAY | ||
312 | udelay(PCI_CONFIG_SPACE_DELAY); | ||
313 | #endif | ||
314 | switch (size) { | 310 | switch (size) { |
315 | case 4: | 311 | case 4: |
316 | cvmx_write64_uint32(pci_addr.u64, cpu_to_le32(val)); | 312 | cvmx_write64_uint32(pci_addr.u64, cpu_to_le32(val)); |