diff options
| author | Tom Rini <trini@konsulko.com> | 2020-02-11 10:58:41 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-02-11 10:58:41 -0500 |
| commit | 9a8942b53d57149754e0dfc975e0d92d1afd4087 (patch) | |
| tree | de55e5352f3a8a79c413c0b8cb533428e5476841 /drivers/timer | |
| parent | ae347120eed8204b1fdf018ddf79131964e57016 (diff) | |
| parent | 21d651fb29cf268b1a5f64d080e3d352ee32c87f (diff) | |
Merge tag 'dm-pull-6feb20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
sandbox conversion to SDL2
TPM TEE driver
Various minor sandbox video enhancements
New driver model core utility functions
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/ast_timer.c | 1 | ||||
| -rw-r--r-- | drivers/timer/cadence-ttc.c | 1 | ||||
| -rw-r--r-- | drivers/timer/dw-apb-timer.c | 2 | ||||
| -rw-r--r-- | drivers/timer/ostm_timer.c | 1 | ||||
| -rw-r--r-- | drivers/timer/stm32_timer.c | 1 | ||||
| -rw-r--r-- | drivers/timer/timer-uclass.c | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/drivers/timer/ast_timer.c b/drivers/timer/ast_timer.c index 21ffdbf575a..3838601f54d 100644 --- a/drivers/timer/ast_timer.c +++ b/drivers/timer/ast_timer.c @@ -9,6 +9,7 @@ #include <timer.h> #include <asm/io.h> #include <asm/arch/timer.h> +#include <linux/err.h> #define AST_TICK_TIMER 1 #define AST_TMC_RELOAD_VAL 0xffffffff diff --git a/drivers/timer/cadence-ttc.c b/drivers/timer/cadence-ttc.c index 75263c5375e..ed48a145f2c 100644 --- a/drivers/timer/cadence-ttc.c +++ b/drivers/timer/cadence-ttc.c @@ -8,6 +8,7 @@ #include <errno.h> #include <timer.h> #include <asm/io.h> +#include <linux/err.h> #define CNT_CNTRL_RESET BIT(4) diff --git a/drivers/timer/dw-apb-timer.c b/drivers/timer/dw-apb-timer.c index fad22be8c91..35271b20c89 100644 --- a/drivers/timer/dw-apb-timer.c +++ b/drivers/timer/dw-apb-timer.c @@ -8,8 +8,10 @@ #include <common.h> #include <dm.h> #include <clk.h> +#include <malloc.h> #include <reset.h> #include <timer.h> +#include <dm/device_compat.h> #include <asm/io.h> #include <asm/arch/timer.h> diff --git a/drivers/timer/ostm_timer.c b/drivers/timer/ostm_timer.c index f0e25093ca4..48a5055b05e 100644 --- a/drivers/timer/ostm_timer.c +++ b/drivers/timer/ostm_timer.c @@ -6,6 +6,7 @@ */ #include <common.h> +#include <malloc.h> #include <asm/io.h> #include <dm.h> #include <clk.h> diff --git a/drivers/timer/stm32_timer.c b/drivers/timer/stm32_timer.c index 76315100e22..76d99a2b865 100644 --- a/drivers/timer/stm32_timer.c +++ b/drivers/timer/stm32_timer.c @@ -9,6 +9,7 @@ #include <dm.h> #include <fdtdec.h> #include <timer.h> +#include <dm/device_compat.h> #include <asm/io.h> diff --git a/drivers/timer/timer-uclass.c b/drivers/timer/timer-uclass.c index 97a4c748518..b619200f00f 100644 --- a/drivers/timer/timer-uclass.c +++ b/drivers/timer/timer-uclass.c @@ -11,6 +11,7 @@ #include <clk.h> #include <errno.h> #include <timer.h> +#include <linux/err.h> DECLARE_GLOBAL_DATA_PTR; |