diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2022-05-27 10:32:08 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2022-05-27 10:32:08 +0200 |
commit | 57963a92a70b037aa22544fbc34742e5be689c04 (patch) | |
tree | ea4591ebe6bdd6dea8286c4eef6cc7906716acb3 /include | |
parent | 317f29c14d0cca09952f1022491454b23455ebcb (diff) | |
parent | 9c04a8ff03def4df3f81219ffbe1ec9b44ff5348 (diff) | |
download | linux-57963a92a70b037aa22544fbc34742e5be689c04.tar.gz linux-57963a92a70b037aa22544fbc34742e5be689c04.tar.bz2 linux-57963a92a70b037aa22544fbc34742e5be689c04.zip |
Merge tag 'timers-v5.19-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clockevent/clocksource driver updates from Daniel Lezcano:
- Add Mediatek MT8186 DT bindings (Allen-KH Cheng)
- Remove dead code corresponding of the IXP4xx board removal (Linus
Walleij)
- Add CLOCK_EVT_FEAT_C3STOP flag for the RISC-V SBI timer (Samuel
Holland)
- Do not return an error if there are multiple definitions of the sp804
timers in the DT (Andre Przywara)
- Add the missing SPDX identifier (Thomas Gleixner)
- Remove an unncessary NULL check as it is done right before at probe
time for the timer-ti-dm (Dan Carpenter)
- Fix the irq_of_parse_and_map() return code check on onexas-nps
(Krzysztof Kozlowski)
Link: https://lore.kernel.org/lkml/b5a83e54-1ee1-f910-4be4-bc3bf1015243@linaro.org
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/platform_data/timer-ixp4xx.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/include/linux/platform_data/timer-ixp4xx.h b/include/linux/platform_data/timer-ixp4xx.h deleted file mode 100644 index ee92ae7edaed..000000000000 --- a/include/linux/platform_data/timer-ixp4xx.h +++ /dev/null @@ -1,11 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __TIMER_IXP4XX_H -#define __TIMER_IXP4XX_H - -#include <linux/ioport.h> - -void __init ixp4xx_timer_setup(resource_size_t timerbase, - int timer_irq, - unsigned int timer_freq); - -#endif |