powerpc/embedded6xx/mve5100: 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-16-oohall@gmail.com

diff --git a/arch/powerpc/platforms/embedded6xx/mvme5100.c b/arch/powerpc/platforms/embedded6xx/mvme5100.c
index 1cd488daa0bf959c6cfcb8637a50ca13c3fed609..c06a0490d157f0e61acd3337b3ecae8ec75f8c9e 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/mvme5100.c
+++ b/arch/powerpc/platforms/embedded6xx/mvme5100.c
@@ -154,17 +154,19 @@ static const struct of_device_id mvme5100_of_bus_ids[] __initconst = {
  */
 static void __init mvme5100_setup_arch(void)
 {
-       struct device_node *np;
-
        if (ppc_md.progress)
                ppc_md.progress("mvme5100_setup_arch()", 0);
 
-       for_each_compatible_node(np, "pci", "hawk-pci")
-               mvme5100_add_bridge(np);
-
        restart = ioremap(BOARD_MODRST_REG, 4);
 }
 
+static void __init mvme5100_setup_pci(void)
+{
+       struct device_node *np;
+
+       for_each_compatible_node(np, "pci", "hawk-pci")
+               mvme5100_add_bridge(np);
+}
 
 static void mvme5100_show_cpuinfo(struct seq_file *m)
 {
@@ -205,6 +207,7 @@ define_machine(mvme5100) {
        .name                   = "MVME5100",
        .probe                  = mvme5100_probe,
        .setup_arch             = mvme5100_setup_arch,
+       .discover_phbs          = mvme5100_setup_pci,
        .init_IRQ               = mvme5100_pic_init,
        .show_cpuinfo           = mvme5100_show_cpuinfo,
        .get_irq                = mpic_get_irq,

diff --git a/arch/powerpc/platforms/embedded6xx/storcenter.c b/arch/powerpc/platforms/embedded6xx/storcenter.c
index e346ddcef45e6916405012760af4edf00ce731d9..e188b90f7016e7f545db8dc57eca9b9639d0be98 100644 (file)
--- a/arch/powerpc/platforms/embedded6xx/storcenter.c
+++ b/arch/powerpc/platforms/embedded6xx/storcenter.c
@@ -65,14 +65,17 @@ static int __init storcenter_add_bridge(struct device_node *dev)
 }
 
 static void __init storcenter_setup_arch(void)
+{
+       printk(KERN_INFO "IOMEGA StorCenter\n");
+}
+
+static void __init storcenter_setup_pci(void)
 {
        struct device_node *np;
 
        /* Lookup PCI host bridges */
        for_each_compatible_node(np, "pci", "mpc10x-pci")
                storcenter_add_bridge(np);
-
-       printk(KERN_INFO "IOMEGA StorCenter\n");
 }
 
 /*
@@ -117,6 +120,7 @@ define_machine(storcenter){
        .name                   = "IOMEGA StorCenter",
        .probe                  = storcenter_probe,
        .setup_arch             = storcenter_setup_arch,
+       .discover_phbs          = storcenter_setup_pci,
        .init_IRQ               = storcenter_init_IRQ,
        .get_irq                = mpic_get_irq,
        .restart                = storcenter_restart,