diff options
author | Michal Simek <monstr@monstr.eu> | 2011-12-09 06:26:16 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2012-01-05 02:22:01 -0500 |
commit | 5a26cd69cc8156df8e8bfac8d656ebaabc62be2c (patch) | |
tree | 278795734210f95e892f33f6fdf75195dc45a9ee /arch/microblaze/kernel/timer.c | |
parent | eecb20720f1b29019725515051e41bc7c079f91f (diff) |
microblaze: Use of_find_compatible_node for timer and intc
Calling of_find_compatible_node instead of calling private code
which does the same.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/kernel/timer.c')
-rw-r--r-- | arch/microblaze/kernel/timer.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c index af74b1113aab..3ba1e1c8c2eb 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c | |||
@@ -243,7 +243,7 @@ static int timer_initialized; | |||
243 | 243 | ||
244 | void __init time_init(void) | 244 | void __init time_init(void) |
245 | { | 245 | { |
246 | u32 irq, i = 0; | 246 | u32 irq; |
247 | u32 timer_num = 1; | 247 | u32 timer_num = 1; |
248 | struct device_node *timer = NULL; | 248 | struct device_node *timer = NULL; |
249 | const void *prop; | 249 | const void *prop; |
@@ -258,16 +258,7 @@ void __init time_init(void) | |||
258 | 0 | 258 | 0 |
259 | }; | 259 | }; |
260 | #endif | 260 | #endif |
261 | const char * const timer_list[] = { | 261 | timer = of_find_compatible_node(NULL, NULL, "xlnx,xps-timer-1.00.a"); |
262 | "xlnx,xps-timer-1.00.a", | ||
263 | NULL | ||
264 | }; | ||
265 | |||
266 | for (i = 0; timer_list[i] != NULL; i++) { | ||
267 | timer = of_find_compatible_node(NULL, NULL, timer_list[i]); | ||
268 | if (timer) | ||
269 | break; | ||
270 | } | ||
271 | BUG_ON(!timer); | 262 | BUG_ON(!timer); |
272 | 263 | ||
273 | timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL)); | 264 | timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL)); |
@@ -283,8 +274,8 @@ void __init time_init(void) | |||
283 | #ifdef CONFIG_SELFMOD_TIMER | 274 | #ifdef CONFIG_SELFMOD_TIMER |
284 | selfmod_function((int *) arr_func, timer_baseaddr); | 275 | selfmod_function((int *) arr_func, timer_baseaddr); |
285 | #endif | 276 | #endif |
286 | printk(KERN_INFO "%s #0 at 0x%08x, irq=%d\n", | 277 | printk(KERN_INFO "XPS timer #0 at 0x%08x, irq=%d\n", |
287 | timer_list[i], timer_baseaddr, irq); | 278 | timer_baseaddr, irq); |
288 | 279 | ||
289 | /* If there is clock-frequency property than use it */ | 280 | /* If there is clock-frequency property than use it */ |
290 | prop = of_get_property(timer, "clock-frequency", NULL); | 281 | prop = of_get_property(timer, "clock-frequency", NULL); |