diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2015-02-09 11:20:36 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-09 11:20:36 +0100 |
| commit | f40d149b58f5dea148ceaee5f9249da133e5004c (patch) | |
| tree | 413b03df98cb9b2d8e877481dfd0795a89dedc7d /drivers/clocksource/versatile.c | |
| parent | hrtimer: Make __hrtimer_get_next_event() static (diff) | |
| parent | dts: versatile: Add sysregs node (diff) | |
| download | wireguard-linux-f40d149b58f5dea148ceaee5f9249da133e5004c.tar.xz wireguard-linux-f40d149b58f5dea148ceaee5f9249da133e5004c.zip | |
Merge branch 'clockevents/3.20' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevents updates from Daniel Lezcano:
- Add new driver for the Conexant Digicolor SoCs (Baruch Siach)
- Add new driver for the rockchip rk3288 board (Daniel Lezcano)
- Add new asm9260 driver for MIPS (Oleksij Rempel)
- Add DT definitions for the versatile AB/PB boards (Rob Herring)
- Rename the 'marco' timer to 'atlas7' (Barry Song)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to '')
| -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); |