Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b690c425 authored by Daniel Hellstrom's avatar Daniel Hellstrom Committed by David S. Miller
Browse files

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



Signed-off-by: default avatarDaniel Hellstrom <daniel@gaisler.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e69f58c0

arch/sparc/kernel/leon_kernel.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -114,7 +114,7 @@ void __init leon_init_timers(irq_handler_t counter_fn) 
	if (leon3_gptimer_regs && leon3_irqctrl_regs) {

	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].val, 0);

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].rld,

		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);

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[0].ctrl, 0);





#ifdef CONFIG_SMP

#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);

		LEON3_BYPASS_STORE_PA(&leon3_gptimer_regs->e[1].ctrl, 0);

# endif

# endif