diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2024-01-18 20:11:46 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2024-01-18 20:11:46 +0100 |
| commit | 80fe58cc176fefceb7afd6dd937f97f37313b9b3 (patch) | |
| tree | a6fd7b15e41640695b64ed4e94345747cb44dfc7 /drivers/clocksource/timer-riscv.c | |
| parent | da65f29dada7f7cbbf0d6375b88a0316f5f7d6f5 (diff) | |
| parent | c0c4579d79d0df841e825c68df450909a0032faf (diff) | |
Merge tag 'timers-v6.8-rc1' of http://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/clocksource updates from Daniel Lezcano:
- Fixed error handling at probe time and uninitialized return code on
ep93xx (Arnd Bergman)
- Fixed some kerneldoc warning on Cadence TTC (Randy Dunlap)
- Fixed kerneldoc warning on Timer TI DM (Tony Lindgren)
- Handle interrupt disabling when shutting down the timer on RISC-V
timer (Joshua Yeong)
- Add compatible string for the StarFive JH8100 clint (Sia Jee Heng)
- Separate mtime and mtimecmp registers in DT bindings (Inochi Amaoto)
Link: https://lore.kernel.org/lkml/0f07af92-e4b2-48de-88a6-dd9aa9e49743@linaro.org
Diffstat (limited to 'drivers/clocksource/timer-riscv.c')
| -rw-r--r-- | drivers/clocksource/timer-riscv.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c index 57857c0dfba97..e66dcbd665665 100644 --- a/drivers/clocksource/timer-riscv.c +++ b/drivers/clocksource/timer-riscv.c @@ -61,12 +61,19 @@ static int riscv_clock_next_event(unsigned long delta, return 0; } +static int riscv_clock_shutdown(struct clock_event_device *evt) +{ + riscv_clock_event_stop(); + return 0; +} + static unsigned int riscv_clock_event_irq; static DEFINE_PER_CPU(struct clock_event_device, riscv_clock_event) = { .name = "riscv_timer_clockevent", .features = CLOCK_EVT_FEAT_ONESHOT, .rating = 100, .set_next_event = riscv_clock_next_event, + .set_state_shutdown = riscv_clock_shutdown, }; /* |