From: Samuel Holland <samuel@sholland.org>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
Rob Herring <robh+dt@kernel.org>
Cc: Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Alessandro Zummo <a.zummo@towertech.it>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-clk@vger.kernel.org, linux-rtc@vger.kernel.org,
linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org,
Samuel Holland <samuel@sholland.org>
Subject: [PATCH v2 9/9] [DO NOT MERGE] clk: sunxi-ng: sun6i-rtc: Add support for T5
Date: Tue, 28 Sep 2021 03:03:35 -0500 [thread overview]
Message-ID: <20210928080335.36706-10-samuel@sholland.org> (raw)
In-Reply-To: <20210928080335.36706-1-samuel@sholland.org>
The T5 RTC is similar to the H616 RTC (no rtc-32k mux, pll-32k as the
second fanout input), except that it adds the ext-osc32k input.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 45 ++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
index f742f6569f6c..88946c990b61 100644
--- a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
+++ b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
@@ -240,6 +240,15 @@ static SUNXI_CCU_GATE_HW(osc32k_fanout_gate_clk, "osc32k-fanout",
static SUNXI_CCU_M_FW_WITH_GATE(rtc_spi_clk, "rtc-spi", "ahb",
0x310, 0, 5, BIT(31), 0);
+static struct ccu_common *sun8i_t5_rtc_ccu_clks[] = {
+ &iosc_clk,
+ &iosc_32k_clk,
+ &ext_osc32k_gate_clk.common,
+ &osc32k_clk.common,
+ &osc24M_32k_clk.common,
+ &osc32k_fanout_clk.common,
+};
+
static struct ccu_common *sun50i_h6_rtc_ccu_clks[] = {
&iosc_clk,
&iosc_32k_clk,
@@ -269,6 +278,21 @@ static struct ccu_common *sun50i_r329_rtc_ccu_clks[] = {
&rtc_spi_clk.common,
};
+static struct clk_hw_onecell_data sun8i_t5_rtc_ccu_hw_clks = {
+ .num = CLK_NUMBER,
+ .hws = {
+ [CLK_OSC32K] = &osc32k_clk.common.hw,
+ [CLK_OSC32K_FANOUT] = &osc32k_fanout_clk.common.hw,
+ [CLK_IOSC] = &iosc_clk.hw,
+
+ [CLK_IOSC_32K] = &iosc_32k_clk.hw,
+ [CLK_EXT_OSC32K_GATE] = &ext_osc32k_gate_clk.common.hw,
+ [CLK_OSC24M_32K] = &osc24M_32k_clk.common.hw,
+ [CLK_RTC_32K] = &rtc_32k_fixed_clk.hw,
+ [CLK_RTC_SPI] = NULL,
+ },
+};
+
static struct clk_hw_onecell_data sun50i_h6_rtc_ccu_hw_clks = {
.num = CLK_NUMBER,
.hws = {
@@ -314,6 +338,13 @@ static struct clk_hw_onecell_data sun50i_r329_rtc_ccu_hw_clks = {
},
};
+static const struct sunxi_ccu_desc sun8i_t5_rtc_ccu_desc = {
+ .ccu_clks = sun8i_t5_rtc_ccu_clks,
+ .num_ccu_clks = ARRAY_SIZE(sun8i_t5_rtc_ccu_clks),
+
+ .hw_clks = &sun8i_t5_rtc_ccu_hw_clks,
+};
+
static const struct sunxi_ccu_desc sun50i_h6_rtc_ccu_desc = {
.ccu_clks = sun50i_h6_rtc_ccu_clks,
.num_ccu_clks = ARRAY_SIZE(sun50i_h6_rtc_ccu_clks),
@@ -335,6 +366,11 @@ static const struct sunxi_ccu_desc sun50i_r329_rtc_ccu_desc = {
.hw_clks = &sun50i_r329_rtc_ccu_hw_clks,
};
+static void sun8i_t5_rtc_ccu_setup(void)
+{
+ have_iosc_calib = 1;
+}
+
static void sun50i_h6_rtc_ccu_setup(void)
{
have_iosc_calib = 1;
@@ -357,6 +393,11 @@ static void sun50i_r329_rtc_ccu_setup(void)
};
}
+static const struct sun6i_rtc_match_data sun8i_t5_rtc_ccu_data = {
+ .desc = &sun8i_t5_rtc_ccu_desc,
+ .setup = sun8i_t5_rtc_ccu_setup,
+};
+
static const struct sun6i_rtc_match_data sun50i_h6_rtc_ccu_data = {
.desc = &sun50i_h6_rtc_ccu_desc,
.setup = sun50i_h6_rtc_ccu_setup,
@@ -373,6 +414,10 @@ static const struct sun6i_rtc_match_data sun50i_r329_rtc_ccu_data = {
};
static const struct of_device_id sun6i_rtc_ccu_match[] = {
+ {
+ .compatible = "allwinner,sun8i-t5-rtc",
+ .data = &sun8i_t5_rtc_ccu_data,
+ },
{
.compatible = "allwinner,sun50i-h6-rtc",
.data = &sun50i_h6_rtc_ccu_data,
--
2.31.1
prev parent reply other threads:[~2021-09-28 8:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 8:03 [PATCH v2 0/9] clk: sunxi-ng: Add a RTC CCU driver Samuel Holland
2021-09-28 8:03 ` [PATCH v2 1/9] dt-bindings: rtc: sun6i: Clean up repetition Samuel Holland
2021-10-04 18:26 ` Rob Herring
2021-09-28 8:03 ` [PATCH v2 2/9] dt-bindings: rtc: sun6i: Add H616, R329, and D1 support Samuel Holland
2021-09-28 12:28 ` Rob Herring
2021-09-29 3:55 ` Samuel Holland
2021-10-25 15:49 ` Maxime Ripard
2021-09-28 8:03 ` [PATCH v2 3/9] clk: sunxi-ng: div: Add macro using CLK_HW_INIT_FW_NAME Samuel Holland
2021-09-28 8:03 ` [PATCH v2 4/9] clk: sunxi-ng: mux: Add macro using CLK_HW_INIT_PARENTS_DATA Samuel Holland
2021-09-28 8:03 ` [PATCH v2 5/9] clk: sunxi-ng: mux: Allow muxes to have keys Samuel Holland
2021-09-28 8:03 ` [PATCH v2 6/9] rtc: sun6i: Allow probing without an early clock provider Samuel Holland
2021-10-23 21:50 ` (subset) " Alexandre Belloni
2021-09-28 8:03 ` [PATCH v2 7/9] clk: sunxi-ng: Add support for the sun6i RTC clocks Samuel Holland
2021-09-28 8:03 ` [PATCH v2 8/9] [DO NOT MERGE] clk: sunxi-ng: sun6i-rtc: Add support for H6 Samuel Holland
2021-09-28 8:03 ` Samuel Holland [this message]
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=20210928080335.36706-10-samuel@sholland.org \
--to=samuel@sholland.org \
--cc=a.zummo@towertech.it \
--cc=alexandre.belloni@bootlin.com \
--cc=devicetree@vger.kernel.org \
--cc=jernej.skrabec@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rtc@vger.kernel.org \
--cc=linux-sunxi@lists.linux.dev \
--cc=mripard@kernel.org \
--cc=mturquette@baylibre.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=wens@csie.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