powerpc/fsl-pci: Choose PCI host bridge with alias pci0 as the primary

[linux-2.6-microblaze.git] / arch / powerpc / sysdev / fsl_pci.c

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 974d3db..b7232c4 100644 (file)
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -1138,6 +1138,19 @@ void __init fsl_pci_assign_primary(void)
                        return;
        }
 
+       /*
+        * If there's no PCI host bridge with ISA then check for
+        * PCI host bridge with alias "pci0" (first PCI host bridge).
+        */
+       np = of_find_node_by_path("pci0");
+       if (np && of_match_node(pci_ids, np) && of_device_is_available(np)) {
+               fsl_pci_primary = np;
+               of_node_put(np);
+               return;
+       }
+       if (np)
+               of_node_put(np);
+
        /*
         * If there's no PCI host bridge with ISA, arbitrarily
         * designate one as primary.  This can go away once