diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:27 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 18:35:27 +0100 |
| commit | 440f39a4fda5d80f290e32f67bd084b63a41a436 (patch) | |
| tree | 913be35b58a374ad3757e937e5f2b23486bb9dd4 /arch/arm/mach-imx/time.c | |
| parent | Merge tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-da... (diff) | |
| parent | Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into... (diff) | |
| download | linux-440f39a4fda5d80f290e32f67bd084b63a41a436.tar.xz linux-440f39a4fda5d80f290e32f67bd084b63a41a436.zip | |
Merge branch 'depends/cleanup' into next/dt
Diffstat (limited to 'arch/arm/mach-imx/time.c')
| -rw-r--r-- | arch/arm/mach-imx/time.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/arch/arm/mach-imx/time.c b/arch/arm/mach-imx/time.c index f017302f6d09..62769df36db1 100644 --- a/arch/arm/mach-imx/time.c +++ b/arch/arm/mach-imx/time.c @@ -256,7 +256,6 @@ static struct irqaction mxc_timer_irq = { static struct clock_event_device clockevent_mxc = { .name = "mxc_timer1", .features = CLOCK_EVT_FEAT_ONESHOT, - .shift = 32, .set_mode = mxc_set_mode, .set_next_event = mx1_2_set_next_event, .rating = 200, @@ -264,21 +263,13 @@ static struct clock_event_device clockevent_mxc = { static int __init mxc_clockevent_init(struct clk *timer_clk) { - unsigned int c = clk_get_rate(timer_clk); - if (timer_is_v2()) clockevent_mxc.set_next_event = v2_set_next_event; - clockevent_mxc.mult = div_sc(c, NSEC_PER_SEC, - clockevent_mxc.shift); - clockevent_mxc.max_delta_ns = - clockevent_delta2ns(0xfffffffe, &clockevent_mxc); - clockevent_mxc.min_delta_ns = - clockevent_delta2ns(0xff, &clockevent_mxc); - clockevent_mxc.cpumask = cpumask_of(0); - - clockevents_register_device(&clockevent_mxc); + clockevents_config_and_register(&clockevent_mxc, + clk_get_rate(timer_clk), + 0xff, 0xfffffffe); return 0; } |