Merge branch 'fixes' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 52xx / mpc52xx_pci.c

diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pci.c b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
index 262eda8659d07ef31be4cc715153f5cc5943032d..e3428ddd9040df88e77380775a0f9cc688fb7824 100644 (file)
--- a/arch/powerpc/platforms/52xx/mpc52xx_pci.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pci.c
@@ -99,6 +99,12 @@ struct mpc52xx_pci {
        u8      reserved6[4];   /* PCI + 0xFC */
 };
 
+/* MPC5200 device tree match tables */
+const struct of_device_id mpc52xx_pci_ids[] __initdata = {
+       { .type = "pci", .compatible = "fsl,mpc5200-pci", },
+       { .type = "pci", .compatible = "mpc5200-pci", },
+       {}
+};
 
 /* ======================================================================== */
 /* PCI configuration acess                                                  */
@@ -406,3 +412,15 @@ mpc52xx_add_bridge(struct device_node *node)
 
        return 0;
 }
+
+void __init mpc52xx_setup_pci(void)
+{
+       struct device_node *pci;
+
+       pci = of_find_matching_node(NULL, mpc52xx_pci_ids);
+       if (!pci)
+               return;
+
+       mpc52xx_add_bridge(pci);
+       of_node_put(pci);
+}