powerpc/82xx/*: 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-9-oohall@gmail.com

diff --git a/arch/powerpc/platforms/82xx/mpc8272_ads.c b/arch/powerpc/platforms/82xx/mpc8272_ads.c
index 3fe1a65..0b5b9de 100644 (file)
--- a/arch/powerpc/platforms/82xx/mpc8272_ads.c
+++ b/arch/powerpc/platforms/82xx/mpc8272_ads.c
@@ -171,7 +171,6 @@ static void __init mpc8272_ads_setup_arch(void)
        iounmap(bcsr);
 
        init_ioports();
-       pq2_init_pci();
 
        if (ppc_md.progress)
                ppc_md.progress("mpc8272_ads_setup_arch(), finish", 0);
@@ -205,6 +204,7 @@ define_machine(mpc8272_ads)
        .name = "Freescale MPC8272 ADS",
        .probe = mpc8272_ads_probe,
        .setup_arch = mpc8272_ads_setup_arch,
+       .discover_phbs = pq2_init_pci,
        .init_IRQ = mpc8272_ads_pic_init,
        .get_irq = cpm2_get_irq,
        .calibrate_decr = generic_calibrate_decr,

diff --git a/arch/powerpc/platforms/82xx/pq2fads.c b/arch/powerpc/platforms/82xx/pq2fads.c
index a740821..ac9113d 100644 (file)
--- a/arch/powerpc/platforms/82xx/pq2fads.c
+++ b/arch/powerpc/platforms/82xx/pq2fads.c
@@ -150,8 +150,6 @@ static void __init pq2fads_setup_arch(void)
        /* Enable external IRQs */
        clrbits32(&cpm2_immr->im_siu_conf.siu_82xx.sc_siumcr, 0x0c000000);
 
-       pq2_init_pci();
-
        if (ppc_md.progress)
                ppc_md.progress("pq2fads_setup_arch(), finish", 0);
 }
@@ -184,6 +182,7 @@ define_machine(pq2fads)
        .name = "Freescale PQ2FADS",
        .probe = pq2fads_probe,
        .setup_arch = pq2fads_setup_arch,
+       .discover_phbs = pq2_init_pci,
        .init_IRQ = pq2fads_pic_init,
        .get_irq = cpm2_get_irq,
        .calibrate_decr = generic_calibrate_decr,