diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-07-18 16:21:20 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-07-30 11:24:51 -0700 |
| commit | 18952f20fadef0a5e099f5c4cac34b97644ccc35 (patch) | |
| tree | 639cc80ca630308dbbce00373db943c334930753 /drivers/clocksource/bcm2835_timer.c | |
| parent | e7e3ff1bfe9c42ee31172e9afdc0383a9e595e29 (diff) | |
| download | op-kernel-dev-18952f20fadef0a5e099f5c4cac34b97644ccc35.zip op-kernel-dev-18952f20fadef0a5e099f5c4cac34b97644ccc35.tar.gz | |
clocksource: bcm2835: Switch to sched_clock_register()
The 32 bit sched_clock interface now supports 64 bits. Upgrade to
the 64 bit function to allow us to remove the 32 bit registration
interface.
Cc: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
Diffstat (limited to 'drivers/clocksource/bcm2835_timer.c')
| -rw-r--r-- | drivers/clocksource/bcm2835_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c index 07ea7ce..26ed331 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c @@ -49,7 +49,7 @@ struct bcm2835_timer { static void __iomem *system_clock __read_mostly; -static u32 notrace bcm2835_sched_read(void) +static u64 notrace bcm2835_sched_read(void) { return readl_relaxed(system_clock); } @@ -110,7 +110,7 @@ static void __init bcm2835_timer_init(struct device_node *node) panic("Can't read clock-frequency"); system_clock = base + REG_COUNTER_LO; - setup_sched_clock(bcm2835_sched_read, 32, freq); + sched_clock_register(bcm2835_sched_read, 32, freq); clocksource_mmio_init(base + REG_COUNTER_LO, node->name, freq, 300, 32, clocksource_mmio_readl_up); |
