diff options
| author | Tom Rini <[email protected]> | 2026-04-06 12:16:57 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2026-04-06 12:16:57 -0600 |
| commit | 93f84ee022a8401421cdaab84fe7d106d83fdb4a (patch) | |
| tree | fb15a4af876e8faf9893fd86c1c0e127265dbe9a /drivers/timer | |
| parent | 88dc2788777babfd6322fa655df549a019aa1e69 (diff) | |
| parent | e2138cf1e6088f12ffa874e87cc8f4b198378635 (diff) | |
Merge branch 'next'
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/timer/ostm_timer.c | 3 | ||||
| -rw-r--r-- | drivers/timer/sp804_timer.c | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig index a84a0dc0539..500a25638a9 100644 --- a/drivers/timer/Kconfig +++ b/drivers/timer/Kconfig @@ -11,7 +11,7 @@ config TIMER config SPL_TIMER bool "Enable driver model for timer drivers in SPL" - depends on TIMER && SPL + depends on TIMER && SPL && SPL_DM help Enable support for timer drivers in SPL. These can be used to get a timer value when in SPL, or perhaps for implementing a delay @@ -328,7 +328,7 @@ config XILINX_TIMER bool "Xilinx timer support" depends on TIMER select REGMAP - select SPL_REGMAP if SPL + select SPL_REGMAP if SPL_TIMER help Select this to enable support for the timer found on any Xilinx boards (axi timer). diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c index 314f956cdfb..3841d3c90d0 100644 --- a/drivers/timer/ostm_timer.c +++ b/drivers/timer/ostm_timer.c @@ -7,7 +7,6 @@ #include <clock_legacy.h> #include <malloc.h> -#include <asm/global_data.h> #include <asm/io.h> #include <dm.h> #include <clk.h> @@ -22,8 +21,6 @@ #define OSTM_CTL 0x20 #define OSTM_CTL_D BIT(1) -DECLARE_GLOBAL_DATA_PTR; - struct ostm_priv { fdt_addr_t regs; }; diff --git a/drivers/timer/sp804_timer.c b/drivers/timer/sp804_timer.c index 3e57f4b98ba..05532e3330c 100644 --- a/drivers/timer/sp804_timer.c +++ b/drivers/timer/sp804_timer.c @@ -8,15 +8,12 @@ #include <dm.h> #include <init.h> #include <log.h> -#include <asm/global_data.h> #include <dm/ofnode.h> #include <mapmem.h> #include <dt-structs.h> #include <timer.h> #include <asm/io.h> -DECLARE_GLOBAL_DATA_PTR; - #define SP804_TIMERX_LOAD 0x00 #define SP804_TIMERX_VALUE 0x04 #define SP804_TIMERX_CONTROL 0x08 |