mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 3/9] ARM: rockchip: drop mach/timer.h
Date: Tue, 28 Feb 2023 15:30:25 +0100	[thread overview]
Message-ID: <20230228143031.1718565-4-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20230228143031.1718565-1-s.hauer@pengutronix.de>

mach/timer.h only contains the declaration of struct rk_timer. Move
this into its only user and drop the file.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 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 <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)
-- 
2.30.2




  parent reply	other threads:[~2023-02-28 14:32 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-28 14:30 [PATCH 0/9] ARM: misc cleanups Sascha Hauer
2023-02-28 14:30 ` [PATCH 1/9] ARM: mxs: remove unused mach/clock.h Sascha Hauer
2023-02-28 14:30 ` [PATCH 2/9] ARM: imx: " Sascha Hauer
2023-02-28 14:30 ` Sascha Hauer [this message]
2023-02-28 14:30 ` [PATCH 4/9] ARM: i.MX: Move imxfb.h to include/platform_data/ Sascha Hauer
2023-02-28 14:30 ` [PATCH 5/9] pinctrl: rockchip: Fix uninitialized var warning Sascha Hauer
2023-02-28 14:30 ` [PATCH 6/9] ARM: at91: remove unnecessary configs Sascha Hauer
2023-02-28 14:30 ` [PATCH 7/9] ARM: at91: Switch all boards to multiimage Sascha Hauer
2023-02-28 14:30 ` [PATCH 8/9] at91: consolidate usb-a963 128m images Sascha Hauer
2023-02-28 14:30 ` [PATCH 9/9] ARM: pxa: Move plat/ include files to mach/ Sascha Hauer
2023-03-01 17:42   ` Ahmad Fatoum
2023-02-28 17:37 ` [PATCH 0/9] ARM: misc cleanups Sam Ravnborg
2023-03-01  7:53   ` Sascha Hauer
2023-03-02 17:01     ` Sam Ravnborg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230228143031.1718565-4-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox