microblaze: trivial: Fix typo fault in timer.c

[deliverable/linux.git] / arch / microblaze / kernel / timer.c

diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index af74b1113aabb32fb3849a952109ffba07eacdcf..78b82f30bdd5100153671e33de0bc2abc25235ba 100644 (file)
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -79,7 +79,7 @@ static inline void microblaze_timer0_start_periodic(unsigned long load_val)
         * !PWMA - disable pwm
         * TINT - clear interrupt status
         * ENT- enable timer itself
-        * EINT - enable interrupt
+        * ENIT - enable interrupt
         * !LOAD - clear the bit to let go
         * ARHT - auto reload
         * !CAPT - no external trigger
@@ -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,33 +258,24 @@ 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));
        timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE);
-       irq = be32_to_cpup(of_get_property(timer, "interrupts", NULL));
+       irq = irq_of_parse_and_map(timer, 0);
        timer_num = be32_to_cpup(of_get_property(timer,
                                                "xlnx,one-timer-only", NULL));
        if (timer_num) {
-               eprintk(KERN_EMERG "Please enable two timers in HW\n");
+               printk(KERN_EMERG "Please enable two timers in HW\n");
                BUG();
        }
 
 #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);