Subject: [PATCH] clocksource: timer-sun5i: Switch to sched_clock_register()

From: [email-masked] (Daniel Lezcano)
Date: Fri, 17 Jan 2014 11:05:20 +0100

On 01/17/2014 02:38 AM, Stephen Boyd wrote:
> The 32 bit sched_clock interface supports 64 bits since 3.13-rc1.
> Upgrade to the 64 bit function to allow us to remove the 32 bit
> registration interface.
>
> Cc: Maxime Ripard <[email-masked]>
> Signed-off-by: Stephen Boyd <[email-masked]>
> ---
>
> Cc'in Ingo because this is simple enough to probably just apply to timers/core

Hi Stephen,

I applied your patch in my tree for 3.15.

Thanks
   -- Daniel

>   drivers/clocksource/timer-sun5i.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c
> index bddc52233d2a..deebcd6469fc 100644
> --- a/drivers/clocksource/timer-sun5i.c
> +++ b/drivers/clocksource/timer-sun5i.c
> @@ -136,7 +136,7 @@ static struct irqaction sun5i_timer_irq = {
>   	.dev_id = &sun5i_clockevent,
>   };
>
> -static u32 sun5i_timer_sched_read(void)
> +static u64 sun5i_timer_sched_read(void)
>   {
>   	return ~readl(timer_base + TIMER_CNTVAL_LO_REG(1));
>   }
> @@ -166,7 +166,7 @@ static void __init sun5i_timer_init(struct device_node *node)
>   	writel(TIMER_CTL_ENABLE | TIMER_CTL_RELOAD,
>   	       timer_base + TIMER_CTL_REG(1));
>
> -	setup_sched_clock(sun5i_timer_sched_read, 32, rate);
> +	sched_clock_register(sun5i_timer_sched_read, 32, rate);
>   	clocksource_mmio_init(timer_base + TIMER_CNTVAL_LO_REG(1), node->name,
>   			      rate, 340, 32, clocksource_mmio_readl_down);
>
>

-- 
  <http://www.linaro.org/> Linaro.org ? Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog