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-ost: Add support for the JZ4760B
Date: Fri, 09 Apr 2021 10:27:29 -0000 [thread overview]
Message-ID: <161796404942.29796.10101610157646631598.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210308212302.10288-3-paul@crapouillou.net>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 352408aff91d06fd2f0e35d52079bd0cd70cd29e
Gitweb: https://git.kernel.org/tip/352408aff91d06fd2f0e35d52079bd0cd70cd29e
Author: Paul Cercueil <paul@crapouillou.net>
AuthorDate: Mon, 08 Mar 2021 21:23:02
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 08 Apr 2021 13:23:23 +02:00
clocksource/drivers/ingenic-ost: Add support for the JZ4760B
The OST in the JZ4760B SoC works exactly the same as in the JZ4770. But
since the JZ4760B is older, its Device Tree string does not fall back to
the JZ4770 one; so add support for the JZ4760B compatible string here.
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-3-paul@crapouillou.net
---
drivers/clocksource/ingenic-ost.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/ingenic-ost.c b/drivers/clocksource/ingenic-ost.c
index 029efc2..d2d6646 100644
--- a/drivers/clocksource/ingenic-ost.c
+++ b/drivers/clocksource/ingenic-ost.c
@@ -167,13 +167,14 @@ static const struct ingenic_ost_soc_info jz4725b_ost_soc_info = {
.is64bit = false,
};
-static const struct ingenic_ost_soc_info jz4770_ost_soc_info = {
+static const struct ingenic_ost_soc_info jz4760b_ost_soc_info = {
.is64bit = true,
};
static const struct of_device_id ingenic_ost_of_match[] = {
{ .compatible = "ingenic,jz4725b-ost", .data = &jz4725b_ost_soc_info, },
- { .compatible = "ingenic,jz4770-ost", .data = &jz4770_ost_soc_info, },
+ { .compatible = "ingenic,jz4760b-ost", .data = &jz4760b_ost_soc_info, },
+ { .compatible = "ingenic,jz4770-ost", .data = &jz4760b_ost_soc_info, },
{ }
};
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: timers/core] clocksource/drivers/ingenic: " tip-bot2 for Paul Cercueil
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-bot2 for Paul Cercueil [this message]
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=161796404942.29796.10101610157646631598.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).