diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 11:55:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-21 11:55:43 -0800 |
| commit | 3f6ec19f2d05d800bbc42d95dece433da7697864 (patch) | |
| tree | 5b863cbf7f1e0be1bd8405ff2641cc83f0d29f3b /drivers/clocksource/timer-davinci.c | |
| parent | b5183bc94b6d2789abb9b5eda6cc3e0601524c79 (diff) | |
| parent | 11db5710d4a954148e00e376f04ba91a498a20dd (diff) | |
Merge tag 'timers-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer updates from Thomas Gleixner:
"Time and timer updates:
- Instead of new drivers remove tango, sirf, u300 and atlas drivers
- Add suspend/resume support for microchip pit64b
- The usual fixes, improvements and cleanups here and there"
* tag 'timers-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
timens: Delete no-op time_ns_init()
alarmtimer: Update kerneldoc
clocksource/drivers/timer-microchip-pit64b: Add clocksource suspend/resume
clocksource/drivers/prima: Remove sirf prima driver
clocksource/drivers/atlas: Remove sirf atlas driver
clocksource/drivers/tango: Remove tango driver
clocksource/drivers/u300: Remove the u300 driver
dt-bindings: timer: nuvoton: Clarify that interrupt of timer 0 should be specified
clocksource/drivers/davinci: Move pr_fmt() before the includes
clocksource/drivers/efm32: Drop unused timer code
Diffstat (limited to 'drivers/clocksource/timer-davinci.c')
| -rw-r--r-- | drivers/clocksource/timer-davinci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clocksource/timer-davinci.c b/drivers/clocksource/timer-davinci.c index bb4eee31ae08..9996c0542520 100644 --- a/drivers/clocksource/timer-davinci.c +++ b/drivers/clocksource/timer-davinci.c @@ -7,6 +7,8 @@ * (with tiny parts adopted from code by Kevin Hilman <khilman@baylibre.com>) */ +#define pr_fmt(fmt) "%s: " fmt, __func__ + #include <linux/clk.h> #include <linux/clockchips.h> #include <linux/interrupt.h> @@ -17,9 +19,6 @@ #include <clocksource/timer-davinci.h> -#undef pr_fmt -#define pr_fmt(fmt) "%s: " fmt, __func__ - #define DAVINCI_TIMER_REG_TIM12 0x10 #define DAVINCI_TIMER_REG_TIM34 0x14 #define DAVINCI_TIMER_REG_PRD12 0x18 |