summaryrefslogtreecommitdiffstats
path: root/arch/mips/mti-malta
diff options
context:
space:
mode:
authorBen Hutchings2010-06-13 23:22:59 +0200
committerRalf Baechle2010-07-26 20:08:19 +0200
commit8faf2e6c201d95b780cd3b4674b7a55ede6dcbbb (patch)
treeccae9e193f41652a4cd1fb9db371298d6ea586e5 /arch/mips/mti-malta
parentMIPS: Alchemy: Define eth platform devices in the correct order (diff)
downloadkernel-qcow2-linux-8faf2e6c201d95b780cd3b4674b7a55ede6dcbbb.tar.gz
kernel-qcow2-linux-8faf2e6c201d95b780cd3b4674b7a55ede6dcbbb.tar.xz
kernel-qcow2-linux-8faf2e6c201d95b780cd3b4674b7a55ede6dcbbb.zip
MIPS: Set io_map_base for several PCI bridges lacking it
Several MIPS platforms don't set pci_controller::io_map_base for their PCI bridges. This results in a panic in pci_iomap(). (The panic is conditional on CONFIG_PCI_DOMAINS, but that is now enabled for all PCI MIPS systems.) Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: linux-mips@linux-mips.org Cc: Martin Michlmayr <tbm@cyrius.com> Cc: Aurelien Jarno <aurelien@aurel32.net> Cc: 584784@bugs.debian.org Patchwork: https://patchwork.linux-mips.org/patch/1377/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/mti-malta')
-rw-r--r--arch/mips/mti-malta/malta-pci.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c
index 2fbfa1a8c3a9..bf80921f2f56 100644
--- a/arch/mips/mti-malta/malta-pci.c
+++ b/arch/mips/mti-malta/malta-pci.c
@@ -247,6 +247,8 @@ void __init mips_pcibios_init(void)
iomem_resource.end &= 0xfffffffffULL; /* 64 GB */
ioport_resource.end = controller->io_resource->end;
+ controller->io_map_base = mips_io_port_base;
+
register_pci_controller(controller);
}