Commit-ID: 00e2bcd6d35f59fce7fa0e76e24d08f74c6a8506 Gitweb: http://git.kernel.org/tip/00e2bcd6d35f59fce7fa0e76e24d08f74c6a8506 Author: Stephen Boyd <[email protected]> AuthorDate: Thu, 16 Jan 2014 17:38:06 -0800 Committer: Ingo Molnar <[email protected]> CommitDate: Sun, 19 Jan 2014 13:23:23 +0100
clocksource: Timer-sun5i: Switch to sched_clock_register() 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. Signed-off-by: Stephen Boyd <[email protected]> Acked-by: Daniel Lezcano <[email protected]> Cc: Maxime Ripard <[email protected]> Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- 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 bddc522..deebcd6 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
