diff options
| author | Michal Simek <monstr@monstr.eu> | 2011-12-09 12:26:16 +0100 | 
|---|---|---|
| committer | Michal Simek <monstr@monstr.eu> | 2012-01-05 08:22:01 +0100 | 
| commit | 5a26cd69cc8156df8e8bfac8d656ebaabc62be2c (patch) | |
| tree | 278795734210f95e892f33f6fdf75195dc45a9ee /arch/microblaze/kernel/timer.c | |
| parent | eecb20720f1b29019725515051e41bc7c079f91f (diff) | |
| download | olio-linux-3.10-5a26cd69cc8156df8e8bfac8d656ebaabc62be2c.tar.xz olio-linux-3.10-5a26cd69cc8156df8e8bfac8d656ebaabc62be2c.zip  | |
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 af74b1113aa..3ba1e1c8c2e 100644 --- a/arch/microblaze/kernel/timer.c +++ b/arch/microblaze/kernel/timer.c @@ -243,7 +243,7 @@ static int timer_initialized;  void __init time_init(void)  { -	u32 irq, i = 0; +	u32 irq;  	u32 timer_num = 1;  	struct device_node *timer = NULL;  	const void *prop; @@ -258,16 +258,7 @@ void __init time_init(void)  				0  			};  #endif -	const char * const timer_list[] = { -		"xlnx,xps-timer-1.00.a", -		NULL -	}; - -	for (i = 0; timer_list[i] != NULL; i++) { -		timer = of_find_compatible_node(NULL, NULL, timer_list[i]); -		if (timer) -			break; -	} +	timer = of_find_compatible_node(NULL, NULL, "xlnx,xps-timer-1.00.a");  	BUG_ON(!timer);  	timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL)); @@ -283,8 +274,8 @@ void __init time_init(void)  #ifdef CONFIG_SELFMOD_TIMER  	selfmod_function((int *) arr_func, timer_baseaddr);  #endif -	printk(KERN_INFO "%s #0 at 0x%08x, irq=%d\n", -		timer_list[i], timer_baseaddr, irq); +	printk(KERN_INFO "XPS timer #0 at 0x%08x, irq=%d\n", +		timer_baseaddr, irq);  	/* If there is clock-frequency property than use it */  	prop = of_get_property(timer, "clock-frequency", NULL);  |