microblaze: Remove additional compatible properties

Device-tree BSP generates longer compatible properties
that's why we can remove extra/old one.

Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c
index f8bc2d79ee350fffacc5f7ac5a0aa5b57679ea09..5c24eb8219f133751965a504769aa9a08b712840 100644 (file)
--- a/arch/microblaze/kernel/heartbeat.c
+++ b/arch/microblaze/kernel/heartbeat.c
@@ -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
        };
 

diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index e1cf0819d75329722d2718e698f22e5453ddd7bf..e85bbea1c62bd1b544abdfbc2e33774beec9f17e 100644 (file)
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -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
                        };
 

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index da9d1e56108b0d1bf006144b9f4e678493ab3898..64ca14dbac6e9b74b5f04ceeac6fd74723f4db15 100644 (file)
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -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
        };
 

diff --git a/arch/microblaze/platform/platform.c b/arch/microblaze/platform/platform.c
index 5b89b58c5aedbc9d9f12aa5d6b2e541134101f6f..b9529caa507af30d38f3a9f58dea81241b73fe25 100644 (file)
--- a/arch/microblaze/platform/platform.c
+++ b/arch/microblaze/platform/platform.c
@@ -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", },
        {}
 };