diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-17 14:36:34 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-17 14:37:25 -0700 |
| commit | 1723f2a18d304ca09a4e7aec28dc5b5797114c5d (patch) | |
| tree | 002361ac3d3793c7e5a0689ee1879769fcf2fb1b /arch | |
| parent | 94f53f1f0845a0c7a9cdd0107939f5876bf9e428 (diff) | |
| parent | bf94d09ddacd3e2e3ebb602fd1826982b0ce825f (diff) | |
| download | linux-1723f2a18d304ca09a4e7aec28dc5b5797114c5d.tar.bz2 | |
Merge branch 'davinci/soc' into next/soc
From Sekhar Nori:
* davinci/soc:
ARM: davinci: convert to clockevents_config_and_register
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-davinci/time.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-davinci/time.c b/arch/arm/mach-davinci/time.c index e7ada0ca72ee..56c6eb5266ad 100644 --- a/arch/arm/mach-davinci/time.c +++ b/arch/arm/mach-davinci/time.c @@ -331,7 +331,6 @@ static void davinci_set_mode(enum clock_event_mode mode, static struct clock_event_device clockevent_davinci = { .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, - .shift = 32, .set_next_event = davinci_set_next_event, .set_mode = davinci_set_mode, }; @@ -397,14 +396,10 @@ void __init davinci_timer_init(void) /* setup clockevent */ clockevent_davinci.name = id_to_name[timers[TID_CLOCKEVENT].id]; - clockevent_davinci.mult = div_sc(davinci_clock_tick_rate, NSEC_PER_SEC, - clockevent_davinci.shift); - clockevent_davinci.max_delta_ns = - clockevent_delta2ns(0xfffffffe, &clockevent_davinci); - clockevent_davinci.min_delta_ns = 50000; /* 50 usec */ clockevent_davinci.cpumask = cpumask_of(0); - clockevents_register_device(&clockevent_davinci); + clockevents_config_and_register(&clockevent_davinci, + davinci_clock_tick_rate, 1, 0xfffffffe); for (i=0; i< ARRAY_SIZE(timers); i++) timer32_config(&timers[i]); |