powerpc/chrp: Move PHB discovery

Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20201103043523.916109-12-oohall@gmail.com

diff --git a/arch/powerpc/platforms/chrp/pci.c b/arch/powerpc/platforms/chrp/pci.c
index b2c2bf3..8c421dc 100644 (file)
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -314,6 +314,14 @@ chrp_find_bridges(void)
                }
        }
        of_node_put(root);
+
+       /*
+        *  "Temporary" fixes for PCI devices.
+        *  -- Geert
+        */
+       hydra_init();           /* Mac I/O */
+
+       pci_create_OF_bus_map();
 }
 
 /* SL82C105 IDE Control/Status Register */

diff --git a/arch/powerpc/platforms/chrp/setup.c b/arch/powerpc/platforms/chrp/setup.c
index c45435a..3cfc382 100644 (file)
--- a/arch/powerpc/platforms/chrp/setup.c
+++ b/arch/powerpc/platforms/chrp/setup.c
@@ -334,22 +334,11 @@ static void __init chrp_setup_arch(void)
        /* On pegasos, enable the L2 cache if not already done by OF */
        pegasos_set_l2cr();
 
-       /* Lookup PCI host bridges */
-       chrp_find_bridges();
-
-       /*
-        *  Temporary fixes for PCI devices.
-        *  -- Geert
-        */
-       hydra_init();           /* Mac I/O */
-
        /*
         *  Fix the Super I/O configuration
         */
        sio_init();
 
-       pci_create_OF_bus_map();
-
        /*
         * Print the banner, then scroll down so boot progress
         * can be printed.  -- Cort
@@ -582,6 +571,7 @@ define_machine(chrp) {
        .name                   = "CHRP",
        .probe                  = chrp_probe,
        .setup_arch             = chrp_setup_arch,
+       .discover_phbs          = chrp_find_bridges,
        .init                   = chrp_init2,
        .show_cpuinfo           = chrp_show_cpuinfo,
        .init_IRQ               = chrp_init_IRQ,