diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 00:26:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-17 00:26:10 +0100 |
| commit | 8c334ce8f0fec7122fc3059c52a697b669a01b41 (patch) | |
| tree | 8dc9226227b041a55f98089cc5c82522e8cab58e /drivers/clocksource/versatile.c | |
| parent | Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcan... (diff) | |
| download | linux-8c334ce8f0fec7122fc3059c52a697b669a01b41.tar.xz linux-8c334ce8f0fec7122fc3059c52a697b669a01b41.zip | |
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull clocksource updates from Ingo Molnar:
"The main change in this tree is the addition of various new SoC
clocksource/clockevents drivers: Conexant Digicolor SoCs, rockchip
rk3288 board, asm9260 for MIPS and versatile AB/PB boards"
* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
dts: versatile: Add sysregs node
clocksource: versatile: Adapt for Versatile AB and PB boards
dt/bindings: Add binding for Versatile system registers
clocksource: Driver for Conexant Digicolor SoC timer
clocksource: devicetree: Document Conexant Digicolor timer binding
clockevents: rockchip: Add rockchip timer for rk3288
ARM: clocksource: Add asm9260_timer driver
clocksource: marco: Rename marco to atlas7
clocksource: sirf: Remove unused variable
Diffstat (limited to 'drivers/clocksource/versatile.c')
| -rw-r--r-- | drivers/clocksource/versatile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/clocksource/versatile.c b/drivers/clocksource/versatile.c index 2798e7492234..0a26d3dde6c0 100644 --- a/drivers/clocksource/versatile.c +++ b/drivers/clocksource/versatile.c @@ -36,5 +36,7 @@ static void __init versatile_sched_clock_init(struct device_node *node) sched_clock_register(versatile_sys_24mhz_read, 32, 24000000); } -CLOCKSOURCE_OF_DECLARE(versatile, "arm,vexpress-sysreg", +CLOCKSOURCE_OF_DECLARE(vexpress, "arm,vexpress-sysreg", + versatile_sched_clock_init); +CLOCKSOURCE_OF_DECLARE(versatile, "arm,versatile-sysreg", versatile_sched_clock_init); |