[PATCH 1/8] clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz

[PATCH 1/8] clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz

[y]

From: John Stultz <john.stultz@linaro.org>

Convert tcb_clksrc to use clocksource_register_hz.

Untested. Help from maintainers would be appreciated.

CC: Nikolaus Voss <n.voss@weinmann.de>
CC: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 drivers/clocksource/tcb_clksrc.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
index 79c47e8..55d0f95 100644
--- a/drivers/clocksource/tcb_clksrc.c
+++ b/drivers/clocksource/tcb_clksrc.c
@@ -59,7 +59,6 @@ static struct clocksource clksrc = {
 	.rating         = 200,
 	.read           = tc_get_cycles,
 	.mask           = CLOCKSOURCE_MASK(32),
-	.shift          = 18,
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
@@ -256,7 +255,6 @@ static int __init tcb_clksrc_init(void)
 		best_divisor_idx = i;
 	}
 
-	clksrc.mult = clocksource_hz2mult(divided_rate, clksrc.shift);
 
 	printk(bootinfo, clksrc.name, CONFIG_ATMEL_TCB_CLKSRC_BLOCK,
 			divided_rate / 1000000,
@@ -292,7 +290,7 @@ static int __init tcb_clksrc_init(void)
 	__raw_writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR);
 
 	/* and away we go! */
-	clocksource_register(&clksrc);
+	clocksource_register_hz(&clksrc, divided_rate);
 
 	/* channel 2:  periodic and oneshot timer support */
 	setup_clkevents(tc, clk32k_divisor_idx);
-- 
1.7.3.2.146.gca209

Re: [PATCH 1/8] clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz

[john stultz]

On Tue, 2011-10-25 at 11:08 -0700, y@kernel.beaverton.ibm.com wrote:
> From: John Stultz <john.stultz@linaro.org>
> 
> Convert tcb_clksrc to use clocksource_register_hz.

Ugh. Apparently I hit "y" at the "Who should the emails appear to be
from?". I blame too many apps recently asking for y/n prompts. :)

The patche's From: is still right, so they should still apply ok, but
I'll resend them later if they don't get merged for 3.2.

thanks
-john

RE: [PATCH 1/8] clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz

[Voss, Nikolaus]

> -----Original Message-----
> From: y@kernel.beaverton.ibm.com [mailto:y@kernel.beaverton.ibm.com]
> Sent: Tuesday, October 25, 2011 8:08 PM
> To: lkml
> Cc: John Stultz; Voss, Nikolaus; Thomas Gleixner
> Subject: [PATCH 1/8] clocksource: Convert tcb_clksrc to use
> clocksource_register_hz/khz
> 
> From: John Stultz <john.stultz@linaro.org>
> 
> Convert tcb_clksrc to use clocksource_register_hz.
> 
> Untested. Help from maintainers would be appreciated.
> 
> CC: Nikolaus Voss <n.voss@weinmann.de>
> CC: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
>  drivers/clocksource/tcb_clksrc.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/clocksource/tcb_clksrc.c
> b/drivers/clocksource/tcb_clksrc.c
> index 79c47e8..55d0f95 100644
> --- a/drivers/clocksource/tcb_clksrc.c
> +++ b/drivers/clocksource/tcb_clksrc.c
> @@ -59,7 +59,6 @@ static struct clocksource clksrc = {
>  	.rating         = 200,
>  	.read           = tc_get_cycles,
>  	.mask           = CLOCKSOURCE_MASK(32),
> -	.shift          = 18,
>  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
>  };
> 
> @@ -256,7 +255,6 @@ static int __init tcb_clksrc_init(void)
>  		best_divisor_idx = i;
>  	}
> 
> -	clksrc.mult = clocksource_hz2mult(divided_rate, clksrc.shift);
> 
>  	printk(bootinfo, clksrc.name, CONFIG_ATMEL_TCB_CLKSRC_BLOCK,
>  			divided_rate / 1000000,
> @@ -292,7 +290,7 @@ static int __init tcb_clksrc_init(void)
>  	__raw_writel(ATMEL_TC_SYNC, tcaddr + ATMEL_TC_BCR);
> 
>  	/* and away we go! */
> -	clocksource_register(&clksrc);
> +	clocksource_register_hz(&clksrc, divided_rate);
> 
>  	/* channel 2:  periodic and oneshot timer support */
>  	setup_clkevents(tc, clk32k_divisor_idx);
> --
> 1.7.3.2.146.gca209

This works on my G45 system.

Acked-by: Nikolaus Voss <n.voss@weinmann.de>