From 3b5b5e01b4990f8d7cc383314178a933c2fea3e2 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Dec 2010 13:21:33 +0000 Subject: [PATCH] --- yaml --- r: 225828 b: refs/heads/master c: 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-orion/time.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5e1fef9e0a96..1043ffc8daf3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0387320c32d4b9852e6436233274003e82318a6 +refs/heads/master: 1d0ac3cdf3d31ba84499c3a914aa2b54eecbf2af diff --git a/trunk/arch/arm/plat-orion/time.c b/trunk/arch/arm/plat-orion/time.c index 715a30177f28..11e2583e85e4 100644 --- a/trunk/arch/arm/plat-orion/time.c +++ b/trunk/arch/arm/plat-orion/time.c @@ -102,7 +102,6 @@ static cycle_t orion_clksrc_read(struct clocksource *cs) static struct clocksource orion_clksrc = { .name = "orion_clocksource", - .shift = 20, .rating = 300, .read = orion_clksrc_read, .mask = CLOCKSOURCE_MASK(32), @@ -245,8 +244,7 @@ void __init orion_time_init(unsigned int irq, unsigned int tclk) writel(u & ~BRIDGE_INT_TIMER0, BRIDGE_MASK); u = readl(TIMER_CTRL); writel(u | TIMER0_EN | TIMER0_RELOAD_EN, TIMER_CTRL); - orion_clksrc.mult = clocksource_hz2mult(tclk, orion_clksrc.shift); - clocksource_register(&orion_clksrc); + clocksource_register_hz(&orion_clksrc, tclk); /* * Setup clockevent timer (interrupt-driven.)