From debc43a838e63690bdbe7ae6820bb1940e491fa8 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 28 Feb 2023 15:30:25 +0100 Subject: 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 --- arch/arm/mach-rockchip/include/mach/timer.h | 19 ------------------- drivers/clocksource/rk_timer.c | 10 +++++++++- 2 files changed, 9 insertions(+), 20 deletions(-) delete mode 100644 arch/arm/mach-rockchip/include/mach/timer.h 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 #include #include -#include #include #include #include #include +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) -- cgit v1.2.3