projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus-3.4' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf
[cascardo/linux.git]
/
arch
/
microblaze
/
kernel
/
timer.c
diff --git
a/arch/microblaze/kernel/timer.c
b/arch/microblaze/kernel/timer.c
index
3cb0bf6
..
cadfd56
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
* !PWMA - disable pwm
* TINT - clear interrupt status
* ENT- enable timer itself
- * E
IN
T - enable interrupt
+ * E
NI
T - enable interrupt
* !LOAD - clear the bit to let go
* ARHT - auto reload
* !CAPT - no external trigger
* !LOAD - clear the bit to let go
* ARHT - auto reload
* !CAPT - no external trigger
@@
-274,8
+274,8
@@
void __init time_init(void)
#ifdef CONFIG_SELFMOD_TIMER
selfmod_function((int *) arr_func, timer_baseaddr);
#endif
#ifdef CONFIG_SELFMOD_TIMER
selfmod_function((int *) arr_func, timer_baseaddr);
#endif
- printk(KERN_INFO "
XPS timer
#0 at 0x%08x, irq=%d\n",
- timer_baseaddr, irq);
+ printk(KERN_INFO "
%s
#0 at 0x%08x, irq=%d\n",
+ timer
->name, timer
_baseaddr, irq);
/* If there is clock-frequency property than use it */
prop = of_get_property(timer, "clock-frequency", NULL);
/* If there is clock-frequency property than use it */
prop = of_get_property(timer, "clock-frequency", NULL);