From: "tip-bot2 for 周琰杰" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: zhouyanjie@wanyeetech.com,
Daniel Lezcano <daniel.lezcano@linaro.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] clocksource/drivers/ingenic: Add support for TCU of X1000
Date: Thu, 19 Mar 2020 08:47:51 -0000 [thread overview]
Message-ID: <158460767109.28353.9865381675905644674.tip-bot2@tip-bot2> (raw)
In-Reply-To: <1582100974-129559-5-git-send-email-zhouyanjie@wanyeetech.com>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: a7cd39552194954bcdecfd9ff775466a61bda5bb
Gitweb: https://git.kernel.org/tip/a7cd39552194954bcdecfd9ff775466a61bda5bb
Author: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
AuthorDate: Wed, 19 Feb 2020 16:29:33 +08:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 27 Feb 2020 11:22:22 +01:00
clocksource/drivers/ingenic: Add support for TCU of X1000
X1000 has a different TCU containing OST, since X1000, OST has been
independent of TCU. This patch is prepare for later OST driver.
Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/1582100974-129559-5-git-send-email-zhouyanjie@wanyeetech.com
---
drivers/clocksource/ingenic-timer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clocksource/ingenic-timer.c b/drivers/clocksource/ingenic-timer.c
index 4bbdb3d..4963336 100644
--- a/drivers/clocksource/ingenic-timer.c
+++ b/drivers/clocksource/ingenic-timer.c
@@ -230,6 +230,7 @@ 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,jz4770-tcu", .data = &jz4740_soc_info, },
+ { .compatible = "ingenic,x1000-tcu", .data = &jz4740_soc_info, },
{ /* sentinel */ }
};
@@ -302,7 +303,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(jz4770_tcu_intc, "ingenic,jz4770-tcu", ingenic_tcu_init);
-
+TIMER_OF_DECLARE(x1000_tcu_intc, "ingenic,x1000-tcu", ingenic_tcu_init);
static int __init ingenic_tcu_probe(struct platform_device *pdev)
{
next prev parent reply other threads:[~2020-03-19 8:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 8:29 Add support for TCU of X1000 周琰杰 (Zhou Yanjie)
2020-02-19 8:29 ` [PATCH 0/4] " 周琰杰 (Zhou Yanjie)
2020-02-19 8:29 ` [PATCH 1/4] dt-bindings: timer: Add X1000 bindings 周琰杰 (Zhou Yanjie)
2020-02-26 15:29 ` Rob Herring
2020-02-27 10:22 ` Daniel Lezcano
2020-03-19 8:47 ` [tip: timers/core] " tip-bot2 for 周琰杰
2020-02-19 8:29 ` [PATCH 2/4] clk: Ingenic: Add support for TCU of X1000 周琰杰 (Zhou Yanjie)
2020-03-04 10:41 ` Zhou Yanjie
2020-03-20 23:59 ` Stephen Boyd
2020-02-19 8:29 ` [PATCH 3/4] clocksource: " 周琰杰 (Zhou Yanjie)
2020-02-27 10:23 ` Daniel Lezcano
2020-03-19 8:47 ` tip-bot2 for 周琰杰 [this message]
2020-02-19 8:29 ` [PATCH 4/4] irqchip: " 周琰杰 (Zhou Yanjie)
2020-03-04 10:58 ` Marc Zyngier
2020-03-04 11:22 ` Zhou Yanjie
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=158460767109.28353.9865381675905644674.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=x86@kernel.org \
--cc=zhouyanjie@wanyeetech.com \
/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).