4 files changed, 17 insertions, 1 deletions

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
index 2539bb560694..9b559ebc66f8 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c
@@ -272,4 +272,5 @@ define_machine(mpc85xx_cds) {
         .restart        = mpc85xx_restart,
         .calibrate_decr = generic_calibrate_decr,
         .progress       = udbg_progress,
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 };
diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index e67e10d3272f..e9eaa0749ae6 100644
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -431,7 +431,6 @@ mpc86xx_time_init(void)
         return 0;
 }
 
-
 define_machine(mpc86xx_hpcn) {
         .name                   = "MPC86xx HPCN",
         .probe                  = mpc86xx_hpcn_probe,
@@ -443,4 +442,5 @@ define_machine(mpc86xx_hpcn) {
         .time_init              = mpc86xx_time_init,
         .calibrate_decr         = generic_calibrate_decr,
         .progress               = udbg_progress,
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
 };
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 2eefcde5b0da..faafae601a72 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -142,6 +142,20 @@ int __init fsl_pcie_check_link(struct pci_controller *hose)
         return 0;
 }
 
+void fsl_pcibios_fixup_bus(struct pci_bus *bus)
+{
+        struct pci_controller *hose = (struct pci_controller *) bus->sysdata;
+        int i;
+
+        /* deal with bogus pci_bus when we don't have anything connected on PCIe */
+        if (hose->indirect_type & PPC_INDIRECT_TYPE_NO_PCIE_LINK) {
+                if (bus->parent) {
+                        for (i = 0; i < 4; ++i)
+                                bus->resource[i] = bus->parent->resource[i];
+                }
+        }
+}
+
 int __init fsl_add_bridge(struct device_node *dev, int is_primary)
 {
         int len;
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index 700d47827994..37b04ad26571 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -82,6 +82,7 @@ struct ccsr_pci {
 };
 
 extern int fsl_add_bridge(struct device_node *dev, int is_primary);
+extern void fsl_pcibios_fixup_bus(struct pci_bus *bus);
 
 #endif /* __POWERPC_FSL_PCI_H */
 #endif /* __KERNEL__ */