diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2024-05-10 14:03:56 +0300 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2024-05-10 14:03:56 +0300 |
commit | a3825a7691585485e960cec04ce6667d176b7c67 (patch) | |
tree | 3ca6094be0a9dde6a3e37fda16d1144f77a096e0 /drivers/clocksource/timer-ti-dm.c | |
parent | ddd9120983c3efbcaa3a4c7777da1440f8ce27d8 (diff) | |
parent | 2030a7e11f161b4067bd4eadd984cdb36446fcca (diff) | |
download | linux-a3825a7691585485e960cec04ce6667d176b7c67.tar.xz |
Merge tag 'timers-v6.10-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/source updates from Daniel Lezcano:
- Add the R9A09G057 compatible bindings in the DT documentation and
add specific code to deal with the probe routine being called twice
(Geert Uytterhoeven)
- Remove unused field in the struct dmtimer in the TI driver
(Christophe JAILLET)
- Constify the hisi_161010101_oem_info variable in the ARM arch timer
(Stephen Boyd)
Link: https://lore.kernel.org/lkml/7ca1c46a-93e6-4f67-bee3-623cb56764fa@linaro.org
Diffstat (limited to 'drivers/clocksource/timer-ti-dm.c')
-rw-r--r-- | drivers/clocksource/timer-ti-dm.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clocksource/timer-ti-dm.c b/drivers/clocksource/timer-ti-dm.c index 56acf2617262..b7a34b1a975e 100644 --- a/drivers/clocksource/timer-ti-dm.c +++ b/drivers/clocksource/timer-ti-dm.c @@ -129,7 +129,6 @@ struct dmtimer { void __iomem *func_base; /* function register base */ atomic_t enabled; - unsigned long rate; unsigned reserved:1; unsigned posted:1; unsigned omap1:1; |