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-cadence-ttc.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-cadence-ttc.c')
| -rw-r--r-- | drivers/clocksource/timer-cadence-ttc.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/clocksource/timer-cadence-ttc.c b/drivers/clocksource/timer-cadence-ttc.c index 32daaac9b132..ca7a06489c40 100644 --- a/drivers/clocksource/timer-cadence-ttc.c +++ b/drivers/clocksource/timer-cadence-ttc.c @@ -69,7 +69,7 @@ * @base_addr: Base address of timer * @freq: Timer input clock frequency * @clk: Associated clock source - * @clk_rate_change_nb Notifier block for clock rate changes + * @clk_rate_change_nb: Notifier block for clock rate changes */ struct ttc_timer { void __iomem *base_addr; @@ -134,7 +134,7 @@ static void ttc_set_interval(struct ttc_timer *timer, * @irq: IRQ number of the Timer * @dev_id: void pointer to the ttc_timer instance * - * returns: Always IRQ_HANDLED - success + * Returns: Always IRQ_HANDLED - success **/ static irqreturn_t ttc_clock_event_interrupt(int irq, void *dev_id) { @@ -151,8 +151,9 @@ static irqreturn_t ttc_clock_event_interrupt(int irq, void *dev_id) /** * __ttc_clocksource_read - Reads the timer counter register + * @cs: &clocksource to read from * - * returns: Current timer counter register value + * Returns: Current timer counter register value **/ static u64 __ttc_clocksource_read(struct clocksource *cs) { @@ -173,7 +174,7 @@ static u64 notrace ttc_sched_clock_read(void) * @cycles: Timer interval ticks * @evt: Address of clock event instance * - * returns: Always 0 - success + * Returns: Always %0 - success **/ static int ttc_set_next_event(unsigned long cycles, struct clock_event_device *evt) @@ -186,9 +187,12 @@ static int ttc_set_next_event(unsigned long cycles, } /** - * ttc_set_{shutdown|oneshot|periodic} - Sets the state of timer - * + * ttc_shutdown - Sets the state of timer * @evt: Address of clock event instance + * + * Used for shutdown or oneshot. + * + * Returns: Always %0 - success **/ static int ttc_shutdown(struct clock_event_device *evt) { @@ -202,6 +206,12 @@ static int ttc_shutdown(struct clock_event_device *evt) return 0; } +/** + * ttc_set_periodic - Sets the state of timer + * @evt: Address of clock event instance + * + * Returns: Always %0 - success + */ static int ttc_set_periodic(struct clock_event_device *evt) { struct ttc_timer_clockevent *ttce = to_ttc_timer_clkevent(evt); |