From: "tip-bot2 for Uwe Kleine-König" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: u.kleine-koenig@pengutronix.de,
Daniel Lezcano <daniel.lezcano@linaro.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user
Date: Mon, 26 Jun 2023 09:11:37 -0000 [thread overview]
Message-ID: <168777069743.404.1171447631326767889.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20230328100531.879485-3-u.kleine-koenig@pengutronix.de>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 281bf6b94aec092096d788b56c106a8c9c2a432a
Gitweb: https://git.kernel.org/tip/281bf6b94aec092096d788b56c106a8c9c2a432a
Author: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
AuthorDate: Tue, 28 Mar 2023 12:05:31 +02:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Fri, 23 Jun 2023 09:33:43 +02:00
clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user
Only the imx-gpt timer driver makes use of enum imx_gpt_type that is
otherwise unused. Move its definition into the timer-imx-gpt driver.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20230328100531.879485-3-u.kleine-koenig@pengutronix.de
---
drivers/clocksource/timer-imx-gpt.c | 7 ++++++-
include/soc/imx/timer.h | 16 ----------------
2 files changed, 6 insertions(+), 17 deletions(-)
delete mode 100644 include/soc/imx/timer.h
diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index 83cefff..28ab4f1 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -16,7 +16,6 @@
#include <linux/of.h>
#include <linux/of_address.h>
#include <linux/of_irq.h>
-#include <soc/imx/timer.h>
/*
* There are 4 versions of the timer hardware on Freescale MXC hardware.
@@ -25,6 +24,12 @@
* - MX25, MX31, MX35, MX37, MX51, MX6Q(rev1.0)
* - MX6DL, MX6SX, MX6Q(rev1.1+)
*/
+enum imx_gpt_type {
+ GPT_TYPE_IMX1, /* i.MX1 */
+ GPT_TYPE_IMX21, /* i.MX21/27 */
+ GPT_TYPE_IMX31, /* i.MX31/35/25/37/51/6Q */
+ GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */
+};
/* defines common for all i.MX */
#define MXC_TCTL 0x00
diff --git a/include/soc/imx/timer.h b/include/soc/imx/timer.h
deleted file mode 100644
index 25f29c6..0000000
--- a/include/soc/imx/timer.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright 2015 Linaro Ltd.
- */
-
-#ifndef __SOC_IMX_TIMER_H__
-#define __SOC_IMX_TIMER_H__
-
-enum imx_gpt_type {
- GPT_TYPE_IMX1, /* i.MX1 */
- GPT_TYPE_IMX21, /* i.MX21/27 */
- GPT_TYPE_IMX31, /* i.MX31/35/25/37/51/6Q */
- GPT_TYPE_IMX6DL, /* i.MX6DL/SX/SL */
-};
-
-#endif /* __SOC_IMX_TIMER_H__ */
next prev parent reply other threads:[~2023-06-26 9:14 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 10:05 [PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init() Uwe Kleine-König
2023-03-28 10:05 ` [PATCH 2/3] clk: imx: Drop inclustion of unused header <soc/imx/timer.h> Uwe Kleine-König
2023-03-28 10:30 ` Uwe Kleine-König
2023-06-26 9:11 ` [tip: timers/core] clk: imx: Drop inclusion " tip-bot2 for Uwe Kleine-König
2023-03-28 10:05 ` [PATCH 3/3] clocksource/drivers/imx-gpt: Fold <soc/imx/timer.h> into its only user Uwe Kleine-König
2023-06-26 9:11 ` tip-bot2 for Uwe Kleine-König [this message]
2023-03-28 10:14 ` [PATCH 1/3] clocksource/drivers/imx-gpt: Drop unused function mxc_timer_init() Fabio Estevam
2023-03-28 10:31 ` Uwe Kleine-König
2023-05-30 15:34 ` Uwe Kleine-König
2023-06-19 15:55 ` Daniel Lezcano
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=168777069743.404.1171447631326767889.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=u.kleine-koenig@pengutronix.de \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®