Patchwork SPARC/LEON: removed constant timer initialization as if HZ=100, now it reflects the value of HZ

login
register
mail settings
Submitter Daniel Hellstrom
Date Oct. 26, 2010, 5:55 p.m.
Message ID <1288115731-28803-1-git-send-email-daniel@gaisler.com>
Download mbox | patch
Permalink /patch/69279/
State Accepted
Delegated to: David Miller
Headers show

Comments

Daniel Hellstrom - Oct. 26, 2010, 5:55 p.m.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>
---
 arch/sparc/kernel/leon_kernel.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
David Miller - Oct. 29, 2010, 8:25 p.m.
From: Daniel Hellstrom <daniel@gaisler.com>
Date: Tue, 26 Oct 2010 19:55:31 +0200

> Signed-off-by: Daniel Hellstrom <daniel@gaisler.com>

Applied, thanks Daniel.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/kernel/leon_kernel.c b/arch/sparc/kernel/leon_kernel.c
index 6a7b4db..dcefd22 100644
--- 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,
-				      (((1000000 / 100) - 1)));
+				      (((1000000 / HZ) - 1)));
 		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].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