diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 15:58:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-18 15:58:29 -0700 |
| commit | 030c9f813b8e48d2b066983c94cf6294968f9496 (patch) | |
| tree | 9a9fc6f2fe2e9cc3b0558c5a92ebeb6e6b8d361a /arch/openrisc | |
| parent | 0dd1a54f44348d9cf6bae57a2b5cb0b53826a2c7 (diff) | |
| parent | dfc256dac54c8b692110bf905c64cb130e15963d (diff) | |
Merge tag 'timers-cleanups-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull treewide timer related cleanups from Thomas Gleixner:
- Remove the leftover CLOCK_TICK_RATE which has been scheduled for
removal more than a decade ago along with some now empty asm/timex.h
files.
- Consolidate delay timer calibration
The construct of having a define in a header requires that
architectures provided asm/timex.h for no reason. Also the function
name for reading the delay timer is confusing at best.
Use a config switch to enable that functionality and rename the
function to delay_read_timer() to make the purpose clear.
This removes some more now empty asm/timex.h files as well.
* tag 'timers-cleanups-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
calibrate: Rework delay timer calibration
treewide: Remove CLOCK_TICK_RATE
x86: Use PIT_TICK_RATE instead of CLOCK_TICK_RATE
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/Kconfig | 1 | ||||
| -rw-r--r-- | arch/openrisc/include/asm/timex.h | 5 | ||||
| -rw-r--r-- | arch/openrisc/lib/delay.c | 9 |
3 files changed, 5 insertions, 10 deletions
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index 9156635dd264..5eb995c13074 100644 --- a/arch/openrisc/Kconfig +++ b/arch/openrisc/Kconfig @@ -7,6 +7,7 @@ config OPENRISC def_bool y select ARCH_32BIT_OFF_T + select ARCH_HAS_DELAY_TIMER select ARCH_HAS_DMA_SET_UNCACHED select ARCH_HAS_DMA_CLEAR_UNCACHED select ARCH_HAS_SYNC_DMA_FOR_DEVICE diff --git a/arch/openrisc/include/asm/timex.h b/arch/openrisc/include/asm/timex.h index 5487fa93dd9b..574e80e6d1f3 100644 --- a/arch/openrisc/include/asm/timex.h +++ b/arch/openrisc/include/asm/timex.h @@ -25,9 +25,4 @@ static inline cycles_t get_cycles(void) } #define get_cycles get_cycles -/* This isn't really used any more */ -#define CLOCK_TICK_RATE 1000 - -#define ARCH_HAS_READ_CURRENT_TIMER - #endif diff --git a/arch/openrisc/lib/delay.c b/arch/openrisc/lib/delay.c index 5e89e4131304..661f9f8f6292 100644 --- a/arch/openrisc/lib/delay.c +++ b/arch/openrisc/lib/delay.c @@ -13,18 +13,17 @@ */ #include <linux/kernel.h> +#include <linux/delay.h> #include <linux/export.h> #include <linux/init.h> -#include <linux/timex.h> + #include <asm/param.h> -#include <asm/delay.h> -#include <asm/timex.h> #include <asm/processor.h> -int read_current_timer(unsigned long *timer_value) +bool delay_read_timer(unsigned long *timer_value) { *timer_value = get_cycles(); - return 0; + return true; } void __delay(unsigned long cycles) |