diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-08-31 03:21:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2023-08-31 03:21:22 +0200 |
| commit | 5146e1f589ccb04cf987b45296aa27f90a2407dc (patch) | |
| tree | e83124418a7b67a001b50b128face860586932d5 /drivers/clocksource/bcm2835_timer.c | |
| parent | d2b32be7debd6c0deeae95844997bd89fbe4769d (diff) | |
| parent | 0a8b07c77ea09602a152d3604e599f95726306d0 (diff) | |
Merge tag 'timers-v6.6-rc1' of https://git.linaro.org/people/daniel.lezcano/linux into timers/core
Pull clocksource/clockdevice updates from Daniel Lezcano:
- Remove oxnas the 0x810 and the 0x820 timer drivers, the platform
being no longer maintained and removed (Neil Armstrong)
- Disable the timer before programming the CVAL as there is no
guarantee of atomicity on the ARM architected timer (Walter Chang)
- Set variable ls1x_timer_lock static on the Loongson1 (Tom Rix)
- Remove duplication of code and data by factoring out the structures
into a single one and convert to the platform driver on the sun5i
(Mans Rullgard)
- Explicitly include correct DT includes (Rob Herring)
Diffstat (limited to 'drivers/clocksource/bcm2835_timer.c')
| -rw-r--r-- | drivers/clocksource/bcm2835_timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clocksource/bcm2835_timer.c b/drivers/clocksource/bcm2835_timer.c index 1592650b2c92..319c0c780a15 100644 --- a/drivers/clocksource/bcm2835_timer.c +++ b/drivers/clocksource/bcm2835_timer.c @@ -10,9 +10,9 @@ #include <linux/irqreturn.h> #include <linux/kernel.h> #include <linux/module.h> +#include <linux/of.h> #include <linux/of_address.h> #include <linux/of_irq.h> -#include <linux/of_platform.h> #include <linux/slab.h> #include <linux/string.h> #include <linux/sched_clock.h> |