summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <monstr@monstr.eu>2010-09-14 08:09:37 +0200
committerMichal Simek <monstr@monstr.eu>2010-10-21 15:51:47 +1000
commite65f1e2843d31d9ed74c7cce273adc0d97b5140f (patch)
tree66843ac7b5c67a889aebb9d79283874ae650439f
parenta7d8355008e4f6bbdcb8f998328afa685cec959c (diff)
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>
-rw-r--r--arch/microblaze/kernel/heartbeat.c1
-rw-r--r--arch/microblaze/kernel/intc.c3
-rw-r--r--arch/microblaze/kernel/timer.c2
-rw-r--r--arch/microblaze/platform/platform.c3
4 files changed, 0 insertions, 9 deletions
diff --git a/arch/microblaze/kernel/heartbeat.c b/arch/microblaze/kernel/heartbeat.c
index f8bc2d79ee35..5c24eb8219f1 100644
--- 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 e1cf0819d753..e85bbea1c62b 100644
--- 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 da9d1e56108b..64ca14dbac6e 100644
--- 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 5b89b58c5aed..b9529caa507a 100644
--- 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", },
{}
};