projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a3b8ff8
)
SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the...
author
Daniel Hellstrom
<daniel@gaisler.com>
Fri, 29 Oct 2010 20:25:24 +0000
(13:25 -0700)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 7 Jan 2011 21:58:22 +0000
(13:58 -0800)
[ Upstream commit
b690c425fe07c725e7f1f7d40303588416cba67f
]
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/sparc/kernel/leon_kernel.c
patch
|
blob
|
history
diff --git
a/arch/sparc/kernel/leon_kernel.c
b/arch/sparc/kernel/leon_kernel.c
index 6a7b4dbc8e09b6c11f8853002ab89130b1547b9e..dcefd22115524c325397d7b047d43bd5816cb9b3 100644
(file)
--- a/
arch/sparc/kernel/leon_kernel.c
+++ b/
arch/sparc/kernel/leon_kernel.c
@@
-114,7
+114,7
@@
void __init leon_init_timers(irq_handler_t counter_fn)
if (leon3_gptimer_regs && leon3_irqctrl_regs) {
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,
if (leon3_gptimer_regs && leon3_irqctrl_regs) {
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].val, 0);
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,
- (((1000000 /
100
) - 1)));
+ (((1000000 /
HZ
) - 1)));
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);
#ifdef CONFIG_SMP
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);
#ifdef CONFIG_SMP
@@
-128,7
+128,7
@@
void __init leon_init_timers(irq_handler_t counter_fn)
}
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0);
}
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].val, 0);
- LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/
100
) - 1)));
+ LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].rld, (((1000000/
HZ
) - 1)));
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0);
# endif
LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0);
# endif