diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 13:24:16 +0000 |
| commit | a32737e1ca650504f172292dd344eb64c02311f3 (patch) | |
| tree | 7dd2004ece26081507af877d9dd40b1bd4eecc1a /arch/arm/common/timer-sp.c | |
| parent | 27edacac7d97d37ec77779c7da08345298a5d283 (diff) | |
| parent | a3c2b511a844641f6d0b60bd84cd6076143b3f2d (diff) | |
| download | blackbird-op-linux-a32737e1ca650504f172292dd344eb64c02311f3.tar.gz blackbird-op-linux-a32737e1ca650504f172292dd344eb64c02311f3.zip | |
Merge branches 'fixes' and 'misc' into for-linus
Diffstat (limited to 'arch/arm/common/timer-sp.c')
| -rw-r--r-- | arch/arm/common/timer-sp.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c index 2393b5bc96fa..8794a34eae61 100644 --- a/arch/arm/common/timer-sp.c +++ b/arch/arm/common/timer-sp.c @@ -143,7 +143,6 @@ static int sp804_set_next_event(unsigned long next, } static struct clock_event_device sp804_clockevent = { - .shift = 32, .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .set_mode = sp804_set_mode, .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_reload = DIV_ROUND_CLOSEST(rate, HZ); - evt->name = name; 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); - clockevents_register_device(evt); + clockevents_config_and_register(evt, rate, 0xf, 0xffffffff); } |
