projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
2dd1703
)
MIPS: Malta: Change start address to avoid conflicts.
author
Steven J. Hill
<
[email protected]
>
Thu, 19 Jul 2012 07:11:14 +0000
(09:11 +0200)
committer
Ralf Baechle
<
[email protected]
>
Thu, 19 Jul 2012 09:23:43 +0000
(11:23 +0200)
There are ACPI and SMB devices in the 0x1000..0x1fff address range.
Signed-off-by: Steven J. Hill <
[email protected]
>
Cc:
[email protected]
Patchwork: https://patchwork.linux-mips.org/patch/3581/
Signed-off-by: Ralf Baechle <
[email protected]
>
arch/mips/mti-malta/malta-pci.c
patch
|
blob
|
history
diff --git
a/arch/mips/mti-malta/malta-pci.c
b/arch/mips/mti-malta/malta-pci.c
index bf80921f2f56c0b145e698fa2c673ff49c7c0636..916206823d45d404e0083fcfdb4de5bb975d10a1 100644
(file)
--- 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)
return;
}
- if (controller->io_resource->start < 0x00001000UL) /* FIXME */
- controller->io_resource->start = 0x00001000UL;
+ /* Change start address to avoid conflicts with ACPI and SMB devices */
+ if (controller->io_resource->start < 0x00002000UL)
+ controller->io_resource->start = 0x00002000UL;
iomem_resource.end &= 0xfffffffffULL; /* 64 GB */
ioport_resource.end = controller->io_resource->end;