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

Commit 7c324d83 authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 7243/1: sp804: modernize clock event registration 



This removes the hardcoded shift value and lets the clockevent core
come up with suitable mult and div factors. Tested on the
Integrator/CP.

Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4fd7f9b1

arch/arm/common/timer-sp.c

+1 −6
Original line number Original line Diff line number Diff line
@@ -143,7 +143,6 @@ static int sp804_set_next_event(unsigned long next, 
}

}





static struct clock_event_device sp804_clockevent = {

static struct clock_event_device sp804_clockevent = {

	.shift		= 32,

	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,

	.set_mode	= sp804_set_mode,

	.set_mode	= sp804_set_mode,

	.set_next_event	= sp804_set_next_event,

	.set_next_event	= sp804_set_next_event,
@@ -169,13 +168,9 @@ void __init sp804_clockevents_init(void __iomem *base, unsigned int irq, 




	clkevt_base = base;

	clkevt_base = base;

	clkevt_reload = DIV_ROUND_CLOSEST(rate, HZ);

	clkevt_reload = DIV_ROUND_CLOSEST(rate, HZ);



	evt->name = name;

	evt->name = name;

	evt->irq = irq;

	evt->irq = irq;

	evt->mult = div_sc(rate, NSEC_PER_SEC, evt->shift);

	evt->max_delta_ns = clockevent_delta2ns(0xffffffff, evt);

	evt->min_delta_ns = clockevent_delta2ns(0xf, evt);





	setup_irq(irq, &sp804_timer_irq);

	setup_irq(irq, &sp804_timer_irq);

	clockevents_register_device(evt);

	clockevents_config_and_register(evt, rate, 0xf, 0xffffffff);

}
 
}