diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 12:35:36 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-06-20 12:35:36 +0200 |
| commit | e707eb762cf38b63402c1a124192f648a0629168 (patch) | |
| tree | 9e43adc72fbfb49b4287daade4e2be9da8622658 /arch/nios2/kernel/time.c | |
| parent | 938e7cf2d569833a5acf689a8926faf507826253 (diff) | |
| parent | c477990295a78f1248283322bd1ad964c22151bc (diff) | |
Merge branch 'clockevents/4.13' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent changes from Daniel Lezcano:
- Factored out moxart, aspeed, cortina drivers into a generic timer fttrm010.
Take the opportunity to add the delay timer (Linus Walleij)
- Saved / restored tcb atmel context at suspend/resume (Alexandre Belloni)
- Added ast2500 compatible string and fixed aspeed2500 initialization (Daniel
Lezcano)
- Added clock names property for aspeed (Andrew Jeffery)
- Renamed clocksource_of to timer_of (Daniel Lezcano)
- Added a common timer init routine (Daniel Lezcano)
Diffstat (limited to 'arch/nios2/kernel/time.c')
| -rw-r--r-- | arch/nios2/kernel/time.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/nios2/kernel/time.c b/arch/nios2/kernel/time.c index 6e2bdc9b8530..645129aaa9a0 100644 --- a/arch/nios2/kernel/time.c +++ b/arch/nios2/kernel/time.c @@ -350,7 +350,7 @@ void __init time_init(void) if (count < 2) panic("%d timer is found, it needs 2 timers in system\n", count); - clocksource_probe(); + timer_probe(); } -CLOCKSOURCE_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init); +TIMER_OF_DECLARE(nios2_timer, ALTR_TIMER_COMPATIBLE, nios2_time_init); |