microblaze: Remove additional compatible properties
authorMichal Simek <monstr@monstr.eu>
Tue, 14 Sep 2010 06:09:37 +0000 (08:09 +0200)
committerMichal Simek <monstr@monstr.eu>
Thu, 21 Oct 2010 05:51:47 +0000 (15:51 +1000)
Device-tree BSP generates longer compatible properties
that's why we can remove extra/old one.

Signed-off-by: Michal Simek <monstr@monstr.eu>
arch/microblaze/kernel/heartbeat.c
arch/microblaze/kernel/intc.c
arch/microblaze/kernel/timer.c
arch/microblaze/platform/platform.c

index f8bc2d7..5c24eb8 100644 (file)
@@ -49,7 +49,6 @@ void setup_heartbeat(void)
        int j;
        const char * const gpio_list[] = {
                "xlnx,xps-gpio-1.00.a",
-               "xlnx,opb-gpio-1.00.a",
                NULL
        };
 
index e1cf081..e85bbea 100644 (file)
@@ -128,9 +128,6 @@ void __init init_IRQ(void)
 #endif
        const char * const intc_list[] = {
                                "xlnx,xps-intc-1.00.a",
-                               "xlnx,opb-intc-1.00.c",
-                               "xlnx,opb-intc-1.00.b",
-                               "xlnx,opb-intc-1.00.a",
                                NULL
                        };
 
index da9d1e5..64ca14d 100644 (file)
@@ -260,8 +260,6 @@ void __init time_init(void)
 #endif
        const char * const timer_list[] = {
                "xlnx,xps-timer-1.00.a",
-               "xlnx,opb-timer-1.00.b",
-               "xlnx,opb-timer-1.00.a",
                NULL
        };
 
index 5b89b58..b9529ca 100644 (file)
@@ -17,9 +17,6 @@
 
 static struct of_device_id xilinx_of_bus_ids[] __initdata = {
        { .compatible = "simple-bus", },
-       { .compatible = "xlnx,plb-v46-1.00.a", },
-       { .compatible = "xlnx,opb-v20-1.10.c", },
-       { .compatible = "xlnx,opb-v20-1.10.b", },
        { .compatible = "xlnx,compound", },
        {}
 };