diff options
| author | Steven J. Hill <sjhill@mips.com> | 2012-07-19 03:11:14 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-07-19 05:23:43 -0400 |
| commit | c5de50dada1403e1abc8cd4a8c9a1283c859e0bb (patch) | |
| tree | f1542c55822e9ba4890ca5e85cc1df46f0feb3c3 /arch | |
| parent | 2dd17030c940ef1199a07b095ec79c4660fa8734 (diff) | |
MIPS: Malta: Change start address to avoid conflicts.
There are ACPI and SMB devices in the 0x1000..0x1fff address range.
Signed-off-by: Steven J. Hill <sjhill@mips.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/3581/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/mti-malta/malta-pci.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c index bf80921f2f56..916206823d45 100644 --- a/arch/mips/mti-malta/malta-pci.c +++ b/arch/mips/mti-malta/malta-pci.c | |||
| @@ -241,8 +241,9 @@ void __init mips_pcibios_init(void) | |||
| 241 | return; | 241 | return; |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | if (controller->io_resource->start < 0x00001000UL) /* FIXME */ | 244 | /* Change start address to avoid conflicts with ACPI and SMB devices */ |
| 245 | controller->io_resource->start = 0x00001000UL; | 245 | if (controller->io_resource->start < 0x00002000UL) |
| 246 | controller->io_resource->start = 0x00002000UL; | ||
| 246 | 247 | ||
| 247 | iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ | 248 | iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ |
| 248 | ioport_resource.end = controller->io_resource->end; | 249 | ioport_resource.end = controller->io_resource->end; |