diff options
author | Michal Simek <monstr@monstr.eu> | 2010-09-14 02:09:37 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2010-10-21 01:51:47 -0400 |
commit | e65f1e2843d31d9ed74c7cce273adc0d97b5140f (patch) | |
tree | 66843ac7b5c67a889aebb9d79283874ae650439f /arch | |
parent | a7d8355008e4f6bbdcb8f998328afa685cec959c (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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/microblaze/kernel/heartbeat.c | 1 | ||||
-rw-r--r-- | arch/microblaze/kernel/intc.c | 3 | ||||
-rw-r--r-- | arch/microblaze/kernel/timer.c | 2 | ||||
-rw-r--r-- | arch/microblaze/platform/platform.c | 3 |
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) | |||
49 | int j; | 49 | int j; |
50 | const char * const gpio_list[] = { | 50 | const char * const gpio_list[] = { |
51 | "xlnx,xps-gpio-1.00.a", | 51 | "xlnx,xps-gpio-1.00.a", |
52 | "xlnx,opb-gpio-1.00.a", | ||
53 | NULL | 52 | NULL |
54 | }; | 53 | }; |
55 | 54 | ||
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) | |||
128 | #endif | 128 | #endif |
129 | const char * const intc_list[] = { | 129 | const char * const intc_list[] = { |
130 | "xlnx,xps-intc-1.00.a", | 130 | "xlnx,xps-intc-1.00.a", |
131 | "xlnx,opb-intc-1.00.c", | ||
132 | "xlnx,opb-intc-1.00.b", | ||
133 | "xlnx,opb-intc-1.00.a", | ||
134 | NULL | 131 | NULL |
135 | }; | 132 | }; |
136 | 133 | ||
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) | |||
260 | #endif | 260 | #endif |
261 | const char * const timer_list[] = { | 261 | const char * const timer_list[] = { |
262 | "xlnx,xps-timer-1.00.a", | 262 | "xlnx,xps-timer-1.00.a", |
263 | "xlnx,opb-timer-1.00.b", | ||
264 | "xlnx,opb-timer-1.00.a", | ||
265 | NULL | 263 | NULL |
266 | }; | 264 | }; |
267 | 265 | ||
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 @@ | |||
17 | 17 | ||
18 | static struct of_device_id xilinx_of_bus_ids[] __initdata = { | 18 | static struct of_device_id xilinx_of_bus_ids[] __initdata = { |
19 | { .compatible = "simple-bus", }, | 19 | { .compatible = "simple-bus", }, |
20 | { .compatible = "xlnx,plb-v46-1.00.a", }, | ||
21 | { .compatible = "xlnx,opb-v20-1.10.c", }, | ||
22 | { .compatible = "xlnx,opb-v20-1.10.b", }, | ||
23 | { .compatible = "xlnx,compound", }, | 20 | { .compatible = "xlnx,compound", }, |
24 | {} | 21 | {} |
25 | }; | 22 | }; |