From 1dcf09025873be161a323d369e2a55c418c92078 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:21:41 +0000 Subject: [PATCH] --- yaml --- r: 225829 b: refs/heads/master c: 2218543fe0c40ce36fa165c5003072cc8b236c34 h: refs/heads/master i: 225827: cc3dbe020090764c235d4d4303955b35266a90d4 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-stmp3xxx/timer.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1043ffc8daf3..61540df49192 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af +refs/heads/master: 2218543fe0c40ce36fa165c5003072cc8b236c34 diff --git a/trunk/arch/arm/plat-stmp3xxx/timer.c b/trunk/arch/arm/plat-stmp3xxx/timer.c index 063c7bc0e740..c395630a6edc 100644 --- a/trunk/arch/arm/plat-stmp3xxx/timer.c +++ b/trunk/arch/arm/plat-stmp3xxx/timer.c @@ -89,7 +89,6 @@ static struct clocksource cksrc_stmp3xxx = { .rating = 250, .read = stmp3xxx_clock_read, .mask = CLOCKSOURCE_MASK(16), - .shift = 10, .flags = CLOCK_SOURCE_IS_CONTINUOUS, }; @@ -106,8 +105,6 @@ static struct irqaction stmp3xxx_timer_irq = { */ static void __init stmp3xxx_init_timer(void) { - cksrc_stmp3xxx.mult = clocksource_hz2mult(CLOCK_TICK_RATE, - cksrc_stmp3xxx.shift); ckevt_timrot.mult = div_sc(CLOCK_TICK_RATE, NSEC_PER_SEC, ckevt_timrot.shift); ckevt_timrot.min_delta_ns = clockevent_delta2ns(2, &ckevt_timrot); @@ -140,7 +137,7 @@ static void __init stmp3xxx_init_timer(void) setup_irq(IRQ_TIMER0, &stmp3xxx_timer_irq); - clocksource_register(&cksrc_stmp3xxx); + clocksource_register_hz(&cksrc_stmp3xxx, CLOCK_TICK_RATE); clockevents_register_device(&ckevt_timrot); }