diff options
author | Per Andersson <avtobiff@gmail.com> | 2008-08-11 10:00:52 (GMT) |
---|---|---|
committer | Nicolas Pitre <nico@cam.org> | 2008-08-22 02:15:17 (GMT) |
commit | 7a6bb2622692495d1b7445a3e8c257601b803b02 (patch) | |
tree | 5735707076af1295aa6ef9be2413dfab291bd6da /arch/arm/mach-orion5x/kurobox_pro-setup.c | |
parent | 6a55617ed5d1aa62b850de2cf66f5ede2eef4825 (diff) | |
download | linux-7a6bb2622692495d1b7445a3e8c257601b803b02.tar.xz |
[ARM] Orion: Fix boot crash on Kurobox Pro
The Kurobox Pro crashes when any of the PCI controller registers
are accessed. This patch adds a function to the Orion PCI handling
code that board support code can call to disable enumerating the
PCI bus entirely, and makes the Kurobox Pro PCI-related init code
call this function.
Signed-off-by: Per Andersson <avtobiff@gmail.com>
Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-orion5x/kurobox_pro-setup.c')
-rw-r--r-- | arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index cb72f1b..e321ec3 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c @@ -146,8 +146,10 @@ static struct hw_pci kurobox_pro_pci __initdata = { static int __init kurobox_pro_pci_init(void) { - if (machine_is_kurobox_pro()) + if (machine_is_kurobox_pro()) { + orion5x_pci_disable(); pci_common_init(&kurobox_pro_pci); + } return 0; } |