Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 40x / virtex.c

diff --git a/arch/powerpc/platforms/40x/virtex.c b/arch/powerpc/platforms/40x/virtex.c
index 14bbc328170fd76e26e1a5479b2aded9794e802a..0422590040db5dbf12468db78624dab41f69adb5 100644 (file)
--- a/arch/powerpc/platforms/40x/virtex.c
+++ b/arch/powerpc/platforms/40x/virtex.c
@@ -15,22 +15,29 @@
 #include <asm/time.h>
 #include <asm/xilinx_intc.h>
 
+static struct of_device_id xilinx_of_bus_ids[] __initdata = {
+       { .compatible = "xlnx,plb-v46-1.00.a", },
+       { .compatible = "xlnx,plb-v34-1.01.a", },
+       { .compatible = "xlnx,plb-v34-1.02.a", },
+       { .compatible = "xlnx,opb-v20-1.10.c", },
+       { .compatible = "xlnx,dcr-v29-1.00.a", },
+       { .compatible = "xlnx,compound", },
+       {}
+};
+
 static int __init virtex_device_probe(void)
 {
-       if (!machine_is(virtex))
-               return 0;
-
-       of_platform_bus_probe(NULL, NULL, NULL);
+       of_platform_bus_probe(NULL, xilinx_of_bus_ids, NULL);
 
        return 0;
 }
-device_initcall(virtex_device_probe);
+machine_device_initcall(virtex, virtex_device_probe);
 
 static int __init virtex_probe(void)
 {
        unsigned long root = of_get_flat_dt_root();
 
-       if (!of_flat_dt_is_compatible(root, "xilinx,virtex"))
+       if (!of_flat_dt_is_compatible(root, "xlnx,virtex"))
                return 0;
 
        return 1;