powerpc/52xx/media5200: 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-7-oohall@gmail.com

diff --git a/arch/powerpc/platforms/52xx/media5200.c b/arch/powerpc/platforms/52xx/media5200.c
index 07c5bc4ed0b5273e0e8c69c987851eac91591e9e..efb8bdecbcc7190fc95f34dc40f555221e3aca14 100644 (file)
--- a/arch/powerpc/platforms/52xx/media5200.c
+++ b/arch/powerpc/platforms/52xx/media5200.c
@@ -202,8 +202,6 @@ static void __init media5200_setup_arch(void)
        /* Some mpc5200 & mpc5200b related configuration */
        mpc5200_setup_xlb_arbiter();
 
-       mpc52xx_setup_pci();
-
        np = of_find_matching_node(NULL, mpc5200_gpio_ids);
        gpio = of_iomap(np, 0);
        of_node_put(np);
@@ -244,6 +242,7 @@ define_machine(media5200_platform) {
        .name           = "media5200-platform",
        .probe          = media5200_probe,
        .setup_arch     = media5200_setup_arch,
+       .discover_phbs  = mpc52xx_setup_pci,
        .init           = mpc52xx_declare_of_platform_devices,
        .init_IRQ       = media5200_init_irq,
        .get_irq        = mpc52xx_get_irq,