diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-02 22:05:35 -0500 |
| commit | a4ef0657e3075d0f951d78cc1398cb7e05af648a (patch) | |
| tree | 9a4387de5845e6fd1331f0af32bfd82fac9eb039 /drivers/timer | |
| parent | 357040645f9f56b33909520483df9f840be7e181 (diff) | |
| parent | cb3ef6810a27c8ddf5db8694bcef9337f27d12ce (diff) | |
Merge branch '2019-12-02-master-imports'
- A large series of clean-ups to reduce common.h contents
Diffstat (limited to 'drivers/timer')
| -rw-r--r-- | drivers/timer/mpc83xx_timer.c | 7 | ||||
| -rw-r--r-- | drivers/timer/tsc_timer.c | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 8e541109d4..72cb58b693 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -8,6 +8,9 @@ #include <board.h> #include <clk.h> #include <dm.h> +#include <irq_func.h> +#include <status_led.h> +#include <time.h> #include <timer.h> #include <watchdog.h> @@ -171,10 +174,6 @@ void timer_interrupt(struct pt_regs *regs) #ifdef CONFIG_LED_STATUS status_led_tick(priv->timestamp); #endif /* CONFIG_LED_STATUS */ - -#ifdef CONFIG_SHOW_ACTIVITY - board_show_activity(priv->timestamp); -#endif /* CONFIG_SHOW_ACTIVITY */ } void wait_ticks(ulong ticks) diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c index 637c8ff25a..0df551f94c 100644 --- a/drivers/timer/tsc_timer.c +++ b/drivers/timer/tsc_timer.c @@ -9,6 +9,7 @@ #include <common.h> #include <dm.h> #include <malloc.h> +#include <time.h> #include <timer.h> #include <asm/cpu.h> #include <asm/io.h> |