diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2023-02-28 15:30:25 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2023-03-01 11:26:07 +0100 |
| commit | debc43a838e63690bdbe7ae6820bb1940e491fa8 (patch) | |
| tree | 2b764447a8c2d35f86483ee93841f22d4352c7d3 | |
| parent | c062927ad54d883c4fd6d5429ebe33c6b1ce6754 (diff) | |
| download | barebox-debc43a838e63690bdbe7ae6820bb1940e491fa8.tar.gz barebox-debc43a838e63690bdbe7ae6820bb1940e491fa8.tar.xz | |
ARM: rockchip: drop mach/timer.h
mach/timer.h only contains the declaration of struct rk_timer. Move
this into its only user and drop the file.
Link: https://lore.barebox.org/20230228143031.1718565-4-s.hauer@pengutronix.de
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-rockchip/include/mach/timer.h | 19 | ||||
| -rw-r--r-- | drivers/clocksource/rk_timer.c | 10 |
2 files changed, 9 insertions, 20 deletions
diff --git a/arch/arm/mach-rockchip/include/mach/timer.h b/arch/arm/mach-rockchip/include/mach/timer.h deleted file mode 100644 index e6ed0e4e3e..0000000000 --- a/arch/arm/mach-rockchip/include/mach/timer.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * (C) Copyright 2015 Rockchip Electronics Co., Ltd - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef _ASM_ARCH_TIMER_H -#define _ASM_ARCH_TIMER_H - -struct rk_timer { - unsigned int timer_load_count0; - unsigned int timer_load_count1; - unsigned int timer_curr_value0; - unsigned int timer_curr_value1; - unsigned int timer_ctrl_reg; - unsigned int timer_int_status; -}; - -#endif diff --git a/drivers/clocksource/rk_timer.c b/drivers/clocksource/rk_timer.c index 36aa6949e3..1d4b764561 100644 --- a/drivers/clocksource/rk_timer.c +++ b/drivers/clocksource/rk_timer.c @@ -10,12 +10,20 @@ #include <clock.h> #include <init.h> #include <io.h> -#include <mach/timer.h> #include <stdio.h> #include <mach/hardware.h> #include <mach/cru_rk3288.h> #include <common.h> +struct rk_timer { + unsigned int timer_load_count0; + unsigned int timer_load_count1; + unsigned int timer_curr_value0; + unsigned int timer_curr_value1; + unsigned int timer_ctrl_reg; + unsigned int timer_int_status; +}; + struct rk_timer *timer_ptr; static uint64_t rockchip_get_ticks(void) |