powerpc/fsl-pci: Unify pci/pcie initialization code

We unified the Freescale pci/pcie initialization by changing the fsl_pci
to a platform driver. In previous PCI code architecture the initialization
routine is called at board_setup_arch stage. Now the initialization is done
in probe function which is architectural better. Also It's convenient for
adding PM support for PCI controller in later patch.

Now we registered pci controllers as platform devices. So we combine two
initialization code as one platform driver.

Signed-off-by: Jia Hongtao <B38951@freescale.com>
Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Chunhe Lan <Chunhe.Lan@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

2 files changed, 75 insertions, 42 deletions

diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 23acaf4692dc..2ff35765a6ad 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -828,54 +828,78 @@ static const struct of_device_id pci_ids[] = {
 
 struct device_node *fsl_pci_primary;
 
-void __devinit fsl_pci_init(void)
+void fsl_pci_assign_primary(void)
 {
-        int ret;
-        struct device_node *node;
-        struct pci_controller *hose;
-        dma_addr_t max = 0xffffffff;
+        struct device_node *np;
 
         /* Callers can specify the primary bus using other means. */
-        if (!fsl_pci_primary) {
-                /* If a PCI host bridge contains an ISA node, it's primary. */
-                node = of_find_node_by_type(NULL, "isa");
-                while ((fsl_pci_primary = of_get_parent(node))) {
-                        of_node_put(node);
-                        node = fsl_pci_primary;
-
-                        if (of_match_node(pci_ids, node))
-                                break;
-                }
+        if (fsl_pci_primary)
+                return;
+
+        /* If a PCI host bridge contains an ISA node, it's primary. */
+        np = of_find_node_by_type(NULL, "isa");
+        while ((fsl_pci_primary = of_get_parent(np))) {
+                of_node_put(np);
+                np = fsl_pci_primary;
+
+                if (of_match_node(pci_ids, np) && of_device_is_available(np))
+                        return;
         }
 
-        node = NULL;
-        for_each_node_by_type(node, "pci") {
-                if (of_match_node(pci_ids, node)) {
-                        /*
-                         * If there's no PCI host bridge with ISA, arbitrarily
-                         * designate one as primary.  This can go away once
-                         * various bugs with primary-less systems are fixed.
-                         */
-                        if (!fsl_pci_primary)
-                                fsl_pci_primary = node;
-
-                        ret = fsl_add_bridge(node, fsl_pci_primary == node);
-                        if (ret == 0) {
-                                hose = pci_find_hose_for_OF_device(node);
-                                max = min(max, hose->dma_window_base_cur +
-                                                hose->dma_window_size);
-                        }
+        /*
+         * If there's no PCI host bridge with ISA, arbitrarily
+         * designate one as primary.  This can go away once
+         * various bugs with primary-less systems are fixed.
+         */
+        for_each_matching_node(np, pci_ids) {
+                if (of_device_is_available(np)) {
+                        fsl_pci_primary = np;
+                        of_node_put(np);
+                        return;
                 }
         }
+}
+
+static int __devinit fsl_pci_probe(struct platform_device *pdev)
+{
+        int ret;
+        struct device_node *node;
+        struct pci_controller *hose;
+
+        node = pdev->dev.of_node;
+        ret = fsl_add_bridge(node, fsl_pci_primary == node);
 
 #ifdef CONFIG_SWIOTLB
-        /*
-         * if we couldn't map all of DRAM via the dma windows
-         * we need SWIOTLB to handle buffers located outside of
-         * dma capable memory region
-         */
-        if (memblock_end_of_DRAM() - 1 > max)
-                ppc_swiotlb_enable = 1;
+        if (ret == 0) {
+                hose = pci_find_hose_for_OF_device(pdev->dev.of_node);
+
+                /*
+                 * if we couldn't map all of DRAM via the dma windows
+                 * we need SWIOTLB to handle buffers located outside of
+                 * dma capable memory region
+                 */
+                if (memblock_end_of_DRAM() - 1 > hose->dma_window_base_cur +
+                                hose->dma_window_size)
+                        ppc_swiotlb_enable = 1;
+        }
 #endif
+
+        mpc85xx_pci_err_probe(pdev);
+
+        return 0;
+}
+
+static struct platform_driver fsl_pci_driver = {
+        .driver = {
+                .name = "fsl-pci",
+                .of_match_table = pci_ids,
+        },
+        .probe = fsl_pci_probe,
+};
+
+static int __init fsl_pci_init(void)
+{
+        return platform_driver_register(&fsl_pci_driver);
 }
+arch_initcall(fsl_pci_init);
 #endif
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index 54ed82c53235..d078537adece 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -98,10 +98,19 @@ u64 fsl_pci_immrbar_base(struct pci_controller *hose);
 
 extern struct device_node *fsl_pci_primary;
 
-#ifdef CONFIG_FSL_PCI
-void fsl_pci_init(void);
+#ifdef CONFIG_PCI
+void fsl_pci_assign_primary(void);
 #else
-static inline void fsl_pci_init(void) {}
+static inline void fsl_pci_assign_primary(void) {}
+#endif
+
+#ifdef CONFIG_EDAC_MPC85XX
+int mpc85xx_pci_err_probe(struct platform_device *op);
+#else
+static inline int mpc85xx_pci_err_probe(struct platform_device *op)
+{
+        return -ENOTSUPP;
+}
 #endif
 
 #endif /* __POWERPC_FSL_PCI_H */