[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <52D90060.5020104@linaro.org>
Date: Fri, 17 Jan 2014 11:05:20 +0100
From: Daniel Lezcano <daniel.lezcano@...aro.org>
To: Stephen Boyd <sboyd@...eaurora.org>
CC: linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Ingo Molnar <mingo@...hat.com>,
Maxime Ripard <maxime.ripard@...e-electrons.com>
Subject: Re: [PATCH] clocksource: timer-sun5i: Switch to sched_clock_register()
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 <maxime.ripard@...e-electrons.com>
> Signed-off-by: Stephen Boyd <sboyd@...eaurora.org>
> ---
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists