diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2022-12-09 16:41:58 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2022-12-09 16:41:58 +0100 |
| commit | 18a207849218d8c15072f449e6d0b901262290c9 (patch) | |
| tree | 570f3568a70ad2e10fbc389ec4e02457ccaaa205 /include/clocksource | |
| parent | clockevents: Repair kernel-doc for clockevent_delta2ns() (diff) | |
| parent | dt-bindings: timer: renesas,cmt: Add r8a779g0 CMT support (diff) | |
| download | linux-18a207849218d8c15072f449e6d0b901262290c9.tar.xz linux-18a207849218d8c15072f449e6d0b901262290c9.zip | |
Merge tag 'timers-v6.2-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/source driver updates from Daniel Lezcano:
- Add DT bindings for the Rockchip rk3128 timer (Johan Jonker)
- Change the DT bindings for the npcm7xx timer in order to specify
multiple clocks and enable the clock for the timer1 on WPCM450
(Jonathan Neuschäfer)
- Fix the timer duration being too long the ARM architected timer in
order to prevent an integer overflow leading to a negative value and
an immediate interruption (Joe Korty)
- Fix an unused pointer warning reported by lkp and some cleanups in
the timer TI dm (Tony Lindgren)
- Fix a missing call to clk_disable_unprepare() in the error path at
init time on the timer TI dm (Yang Yingliang)
- Use kstrtobool() instead of strtobool() in the ARM architected timer
(Christophe JAILLET)
- Add DT bindings for r8a779g0 on Renesas platform (Wolfram Sang)
Link: https://lore.kernel.org/all/3c4c3bb2-b849-0c87-0948-8a36984bdde4@linaro.org
Diffstat (limited to 'include/clocksource')
| -rw-r--r-- | include/clocksource/timer-ti-dm.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/clocksource/timer-ti-dm.h b/include/clocksource/timer-ti-dm.h index 77eceeae708c..dcc1712f75e7 100644 --- a/include/clocksource/timer-ti-dm.h +++ b/include/clocksource/timer-ti-dm.h @@ -62,8 +62,6 @@ struct omap_dm_timer { }; -int omap_dm_timer_get_irq(struct omap_dm_timer *timer); - u32 omap_dm_timer_modify_idlect_mask(u32 inputmask); /* |