From 5fd627ae5d344d7e7e262944e39f142860ad39c8 Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Fri, 21 Dec 2012 15:06:16 +0100 Subject: [PATCH] --- yaml --- r: 355637 b: refs/heads/master c: 93044fa1527518cfba022b62d2c4b407891d1ff7 h: refs/heads/master i: 355635: 8557f837010dcd1116abda21236940c3fc4b4b75 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mxs/timer.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab0d53673e5a..a02c9d4f7148 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fb318ff75d7c4d5ccc418ab4dcce19aa40fc059 +refs/heads/master: 93044fa1527518cfba022b62d2c4b407891d1ff7 diff --git a/trunk/arch/arm/mach-mxs/timer.c b/trunk/arch/arm/mach-mxs/timer.c index 1f8ec8cd9182..421020498a1b 100644 --- a/trunk/arch/arm/mach-mxs/timer.c +++ b/trunk/arch/arm/mach-mxs/timer.c @@ -207,7 +207,8 @@ static int __init mxs_clockevent_init(struct clk *timer_clk) mxs_clockevent_device.set_next_event = timrotv1_set_next_event; mxs_clockevent_device.cpumask = cpumask_of(0); clockevents_config_and_register(&mxs_clockevent_device, - clk_get_rate(timer_clk), 0xf, + clk_get_rate(timer_clk), + timrot_is_v1() ? 0xf : 0x2, timrot_is_v1() ? 0xfffe : 0xfffffffe); return 0;