diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2022-05-27 11:32:08 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2022-05-27 11:32:08 +0300 |
| commit | 57963a92a70b037aa22544fbc34742e5be689c04 (patch) | |
| tree | ea4591ebe6bdd6dea8286c4eef6cc7906716acb3 /drivers/clocksource/timer-ixp4xx.c | |
| parent | 317f29c14d0cca09952f1022491454b23455ebcb (diff) | |
| parent | 9c04a8ff03def4df3f81219ffbe1ec9b44ff5348 (diff) | |
| download | linux-57963a92a70b037aa22544fbc34742e5be689c04.tar.xz | |
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 'drivers/clocksource/timer-ixp4xx.c')
| -rw-r--r-- | drivers/clocksource/timer-ixp4xx.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c index cbb184953510..720ed70a2964 100644 --- a/drivers/clocksource/timer-ixp4xx.c +++ b/drivers/clocksource/timer-ixp4xx.c @@ -19,8 +19,6 @@ #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/platform_device.h> -/* Goes away with OF conversion */ -#include <linux/platform_data/timer-ixp4xx.h> /* * Constants to make it easy to access Timer Control/Status registers @@ -263,28 +261,6 @@ static struct platform_driver ixp4xx_timer_driver = { }; builtin_platform_driver(ixp4xx_timer_driver); -/** - * ixp4xx_timer_setup() - Timer setup function to be called from boardfiles - * @timerbase: physical base of timer block - * @timer_irq: Linux IRQ number for the timer - * @timer_freq: Fixed frequency of the timer - */ -void __init ixp4xx_timer_setup(resource_size_t timerbase, - int timer_irq, - unsigned int timer_freq) -{ - void __iomem *base; - - base = ioremap(timerbase, 0x100); - if (!base) { - pr_crit("IXP4xx: can't remap timer\n"); - return; - } - ixp4xx_timer_register(base, timer_irq, timer_freq); -} -EXPORT_SYMBOL_GPL(ixp4xx_timer_setup); - -#ifdef CONFIG_OF static __init int ixp4xx_of_timer_init(struct device_node *np) { void __iomem *base; @@ -315,4 +291,3 @@ out_unmap: return ret; } TIMER_OF_DECLARE(ixp4xx, "intel,ixp4xx-timer", ixp4xx_of_timer_init); -#endif |