[PATCH 13/18] powerpc/embedded6xx/holly: Move PHB discovery

[Oliver O'Halloran]

Signed-off-by: Oliver O'Halloran <ooh...@gmail.com>
---
compile tested with holly_defconfig
---
 arch/powerpc/platforms/embedded6xx/holly.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/platforms/embedded6xx/holly.c 
b/arch/powerpc/platforms/embedded6xx/holly.c
index d8f2e2c737bb..53065d564161 100644
--- a/arch/powerpc/platforms/embedded6xx/holly.c
+++ b/arch/powerpc/platforms/embedded6xx/holly.c
@@ -108,15 +108,13 @@ static void holly_remap_bridge(void)
        tsi108_write_reg(TSI108_PCI_P2O_BAR2, 0x0);
 }
 
-static void __init holly_setup_arch(void)
+static void __init holly_init_pci(void)
 {
        struct device_node *np;
 
        if (ppc_md.progress)
                ppc_md.progress("holly_setup_arch():set_bridge", 0);
 
-       tsi108_csr_vir_base = get_vir_csrbase();
-
        /* setup PCI host bridge */
        holly_remap_bridge();
 
@@ -127,6 +125,11 @@ static void __init holly_setup_arch(void)
        ppc_md.pci_exclude_device = holly_exclude_device;
        if (ppc_md.progress)
                ppc_md.progress("tsi108: resources set", 0x100);
+}
+
+static void __init holly_setup_arch(void)
+{
+       tsi108_csr_vir_base = get_vir_csrbase();
 
        printk(KERN_INFO "PPC750GX/CL Platform\n");
 }
@@ -259,6 +262,7 @@ define_machine(holly){
        .name                           = "PPC750 GX/CL TSI",
        .probe                          = holly_probe,
        .setup_arch                     = holly_setup_arch,
+       .discover_phbs                  = holly_init_pci,
        .init_IRQ                       = holly_init_IRQ,
        .show_cpuinfo                   = holly_show_cpuinfo,
        .get_irq                        = mpic_get_irq,
-- 
2.26.2