From: "Clément Péron" <peron.clem@gmail.com>
To: Colin Didier <colin.didier@devialet.com>,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>,
Thomas Gleixner <tglx@linutronix.de>,
Fabio Estevam <fabio.estevam@nxp.com>,
Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>,
Sascha Hauer <s.hauer@pengutronix.de>,
Rob Herring <robh@kernel.org>, NXP Linux Team <linux-imx@nxp.com>,
Pengutronix Kernel Team <kernel@pengutronix.de>
Subject: [PATCH v6 1/5] clk: imx6: add EPIT clock support
Date: Thu, 7 Jun 2018 16:05:40 +0200 [thread overview]
Message-ID: <20180607140544.22268-2-peron.clem@gmail.com> (raw)
In-Reply-To: <20180607140544.22268-1-peron.clem@gmail.com>
From: Colin Didier <colin.didier@devialet.com>
Please ignore this commit.
It has already been merged in clk-next.
Leave it here to avoid error with automatic CI.
---
drivers/clk/imx/clk-imx6q.c | 2 ++
include/dt-bindings/clock/imx6qdl-clock.h | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/imx/clk-imx6q.c b/drivers/clk/imx/clk-imx6q.c
index 8d518ad5dc13..b9ea7037e193 100644
--- a/drivers/clk/imx/clk-imx6q.c
+++ b/drivers/clk/imx/clk-imx6q.c
@@ -753,6 +753,8 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
else
clk[IMX6Q_CLK_ECSPI5] = imx_clk_gate2("ecspi5", "ecspi_root", base + 0x6c, 8);
clk[IMX6QDL_CLK_ENET] = imx_clk_gate2("enet", "ipg", base + 0x6c, 10);
+ clk[IMX6QDL_CLK_EPIT1] = imx_clk_gate2("epit1", "ipg", base + 0x6c, 12);
+ clk[IMX6QDL_CLK_EPIT2] = imx_clk_gate2("epit2", "ipg", base + 0x6c, 14);
clk[IMX6QDL_CLK_ESAI_EXTAL] = imx_clk_gate2_shared("esai_extal", "esai_podf", base + 0x6c, 16, &share_count_esai);
clk[IMX6QDL_CLK_ESAI_IPG] = imx_clk_gate2_shared("esai_ipg", "ahb", base + 0x6c, 16, &share_count_esai);
clk[IMX6QDL_CLK_ESAI_MEM] = imx_clk_gate2_shared("esai_mem", "ahb", base + 0x6c, 16, &share_count_esai);
diff --git a/include/dt-bindings/clock/imx6qdl-clock.h b/include/dt-bindings/clock/imx6qdl-clock.h
index da59fd9cdb5e..7ad171b8f3bf 100644
--- a/include/dt-bindings/clock/imx6qdl-clock.h
+++ b/include/dt-bindings/clock/imx6qdl-clock.h
@@ -271,6 +271,8 @@
#define IMX6QDL_CLK_PRE_AXI 258
#define IMX6QDL_CLK_MLB_SEL 259
#define IMX6QDL_CLK_MLB_PODF 260
-#define IMX6QDL_CLK_END 261
+#define IMX6QDL_CLK_EPIT1 261
+#define IMX6QDL_CLK_EPIT2 262
+#define IMX6QDL_CLK_END 263
#endif /* __DT_BINDINGS_CLOCK_IMX6QDL_H */
--
2.17.1
next prev parent reply other threads:[~2018-06-07 14:07 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-07 14:05 [PATCH v6 0/5] Reintroduce i.MX EPIT Timer Clément Péron
2018-06-07 14:05 ` Clément Péron [this message]
2018-06-07 14:05 ` [PATCH v6 2/5] ARM: imx: remove inexistant EPIT timer init Clément Péron
2018-06-11 14:39 ` Vladimir Zapolskiy
2018-06-07 14:05 ` [PATCH v6 3/5] dt-bindings: timer: add i.MX EPIT timer binding Clément Péron
2018-06-11 14:39 ` Vladimir Zapolskiy
2018-06-11 18:10 ` Rob Herring
2018-06-12 8:06 ` Clément Péron
2018-06-07 14:05 ` [PATCH v6 4/5] clocksource: add driver for i.MX EPIT timer Clément Péron
2018-06-11 12:31 ` Stefan Agner
2018-06-11 12:42 ` Clément Péron
2018-06-11 12:46 ` Stefan Agner
2018-06-11 14:40 ` Vladimir Zapolskiy
2018-06-07 14:05 ` [PATCH v6 5/5] ARM: dts: imx: add missing compatible and clock properties for EPIT Clément Péron
2018-06-11 14:40 ` Vladimir Zapolskiy
2018-06-11 14:39 ` [PATCH v6 0/5] Reintroduce i.MX EPIT Timer Vladimir Zapolskiy
2018-06-11 14:46 ` Clément Péron
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=20180607140544.22268-2-peron.clem@gmail.com \
--to=peron.clem@gmail.com \
--cc=colin.didier@devialet.com \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=tglx@linutronix.de \
--cc=vladimir_zapolskiy@mentor.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).