From b625a2b85221821b6831a387ee23ff7d93ffb7d1 Mon Sep 17 00:00:00 2001 From: Leigh Brown Date: Sat, 16 Apr 2005 15:24:26 -0700 Subject: [PATCH] [PATCH] ppc32: Make the Powerstack II Pro4000 boot again This patch restores the original behaviour of prep_pcibios_fixup() to only call prep_pib_init() on machines with an openpic. This allows the Powerstack II Pro4000 to boot again. Signed-off-by: Leigh Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc/platforms/prep_pci.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/ppc/platforms/prep_pci.c b/arch/ppc/platforms/prep_pci.c index 8cd80eb447bd..4760cb64251d 100644 --- a/arch/ppc/platforms/prep_pci.c +++ b/arch/ppc/platforms/prep_pci.c @@ -1245,8 +1245,13 @@ prep_pcibios_fixup(void) pci_write_config_byte(dev, PCI_INTERRUPT_LINE, dev->irq); } - /* Setup the Winbond or Via PIB */ - prep_pib_init(); + /* Setup the Winbond or Via PIB - prep_pib_init() is coded for + * the non-openpic case, but it breaks (at least) the Utah + * (Powerstack II Pro4000), so only call it if we have an + * openpic. + */ + if (have_openpic) + prep_pib_init(); } static void __init -- 2.20.1