From: "tip-bot2 for Paul Cercueil" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Paul Cercueil <paul@crapouillou.net>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/core] clocksource/drivers/ingenic: Add support for the JZ4760
Date: Fri, 09 Apr 2021 10:27:29 -0000 [thread overview]
Message-ID: <161796404977.29796.7936206069021613068.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210308212302.10288-2-paul@crapouillou.net>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8a3f717f35a3e9a28a935f8e4459c72ba00e90ca
Gitweb: https://git.kernel.org/tip/8a3f717f35a3e9a28a935f8e4459c72ba00e90ca
Author: Paul Cercueil <paul@crapouillou.net>
AuthorDate: Mon, 08 Mar 2021 21:23:01
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 08 Apr 2021 13:23:22 +02:00
clocksource/drivers/ingenic: Add support for the JZ4760
Add support for the TCU (Timer/Counter Unit) of the JZ4760 and JZ4760B
SoCs.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210308212302.10288-2-paul@crapouillou.net
---
drivers/clocksource/ingenic-timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clocksource/ingenic-timer.c b/drivers/clocksource/ingenic-timer.c
index 905fd6b..24ed0f1 100644
--- a/drivers/clocksource/ingenic-timer.c
+++ b/drivers/clocksource/ingenic-timer.c
@@ -264,6 +264,7 @@ static const struct ingenic_soc_info jz4725b_soc_info = {
static const struct of_device_id ingenic_tcu_of_match[] = {
{ .compatible = "ingenic,jz4740-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,jz4725b-tcu", .data = &jz4725b_soc_info, },
+ { .compatible = "ingenic,jz4760-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,jz4770-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,x1000-tcu", .data = &jz4740_soc_info, },
{ /* sentinel */ }
@@ -358,6 +359,7 @@ err_free_ingenic_tcu:
TIMER_OF_DECLARE(jz4740_tcu_intc, "ingenic,jz4740-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(jz4725b_tcu_intc, "ingenic,jz4725b-tcu", ingenic_tcu_init);
+TIMER_OF_DECLARE(jz4760_tcu_intc, "ingenic,jz4760-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(jz4770_tcu_intc, "ingenic,jz4770-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(x1000_tcu_intc, "ingenic,x1000-tcu", ingenic_tcu_init);
next prev parent reply other threads:[~2021-04-09 10:28 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-08 21:23 [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Paul Cercueil
2021-03-08 21:23 ` [PATCH v2 2/3] clocksource: ingenic: Add support for the JZ4760 Paul Cercueil
2021-04-09 10:27 ` tip-bot2 for Paul Cercueil [this message]
2021-03-08 21:23 ` [PATCH v2 3/3] clocksource: ingenic-ost: Add support for the JZ4760B Paul Cercueil
2021-04-09 10:27 ` [tip: timers/core] clocksource/drivers/ingenic-ost: " tip-bot2 for Paul Cercueil
2021-03-10 3:03 ` [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Rob Herring
2021-03-10 13:26 ` Daniel Lezcano
2021-04-09 10:27 ` [tip: timers/core] dt-bindings: timer: " tip-bot2 for Paul Cercueil
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=161796404977.29796.7936206069021613068.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=paul@crapouillou.net \
--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;
as well as URLs for NNTP newsgroup(s).