From: Steven J. Hill Date: Thu, 19 Jul 2012 07:11:14 +0000 (+0200) Subject: MIPS: Malta: Change start address to avoid conflicts. X-Git-Tag: v3.5~3^2~23 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c5de50dada1403e1abc8cd4a8c9a1283c859e0bb;p=profile%2Fcommon%2Fkernel-common.git 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 Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3581/ Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c index bf80921..9162068 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) 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;