From: Samuel Holland <samuel@sholland.org>
To: Maxime Ripard <mripard@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
Jernej Skrabec <jernej.skrabec@gmail.com>,
linux-sunxi@lists.linux.dev
Cc: Alessandro Zummo <a.zummo@towertech.it>,
Michael Turquette <mturquette@baylibre.com>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
linux-arm-kernel@lists.infradead.org,
Rob Herring <robh+dt@kernel.org>,
devicetree@vger.kernel.org, linux-clk@vger.kernel.org,
linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org,
Stephen Boyd <sboyd@kernel.org>,
Samuel Holland <samuel@sholland.org>
Subject: [PATCH v3 6/6] [DO NOT MERGE] clk: sunxi-ng: sun6i-rtc: Add support for H6
Date: Wed, 2 Feb 2022 20:17:36 -0600 [thread overview]
Message-ID: <20220203021736.13434-7-samuel@sholland.org> (raw)
In-Reply-To: <20220203021736.13434-1-samuel@sholland.org>
H6 supports IOSC calibration and an ext-osc32k input. Unlike newer SoCs,
it has a single parent for its fanout clock.
Add support for H6 in the CCU driver, replacing the support in the
existing early OF clock provider.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
Changes in v3:
- Rebase example on top of driver changes, and drop the second example.
drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 15 +++++++++++++++
drivers/rtc/rtc-sun6i.c | 17 -----------------
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
index a39670a7c446..712fda22efd5 100644
--- a/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
+++ b/drivers/clk/sunxi-ng/ccu-sun6i-rtc.c
@@ -295,6 +295,10 @@ static const struct sunxi_ccu_desc sun6i_rtc_ccu_desc = {
.hw_clks = &sun6i_rtc_ccu_hw_clks,
};
+static const struct clk_parent_data sun50i_h6_osc32k_fanout_parents[] = {
+ { .hw = &osc32k_clk.common.hw },
+};
+
static const struct clk_parent_data sun50i_h616_osc32k_fanout_parents[] = {
{ .hw = &osc32k_clk.common.hw },
{ .fw_name = "pll-32k" },
@@ -307,6 +311,13 @@ static const struct clk_parent_data sun50i_r329_osc32k_fanout_parents[] = {
{ .hw = &osc24M_32k_clk.common.hw }
};
+static const struct sun6i_rtc_match_data sun50i_h6_rtc_ccu_data = {
+ .have_ext_osc32k = true,
+ .have_iosc_calibration = true,
+ .osc32k_fanout_parents = sun50i_h6_osc32k_fanout_parents,
+ .osc32k_fanout_nparents = ARRAY_SIZE(sun50i_h6_osc32k_fanout_parents),
+};
+
static const struct sun6i_rtc_match_data sun50i_h616_rtc_ccu_data = {
.have_iosc_calibration = true,
.rtc_32k_single_parent = true,
@@ -321,6 +332,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,sun50i-h6-rtc",
+ .data = &sun50i_h6_rtc_ccu_data,
+ },
{
.compatible = "allwinner,sun50i-h616-rtc",
.data = &sun50i_h616_rtc_ccu_data,
diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index 35b34d14a1db..1a875a32357d 100644
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -364,23 +364,6 @@ CLK_OF_DECLARE_DRIVER(sun8i_h3_rtc_clk, "allwinner,sun8i-h3-rtc",
CLK_OF_DECLARE_DRIVER(sun50i_h5_rtc_clk, "allwinner,sun50i-h5-rtc",
sun8i_h3_rtc_clk_init);
-static const struct sun6i_rtc_clk_data sun50i_h6_rtc_data = {
- .rc_osc_rate = 16000000,
- .fixed_prescaler = 32,
- .has_prescaler = 1,
- .has_out_clk = 1,
- .export_iosc = 1,
- .has_losc_en = 1,
- .has_auto_swt = 1,
-};
-
-static void __init sun50i_h6_rtc_clk_init(struct device_node *node)
-{
- sun6i_rtc_clk_init(node, &sun50i_h6_rtc_data);
-}
-CLK_OF_DECLARE_DRIVER(sun50i_h6_rtc_clk, "allwinner,sun50i-h6-rtc",
- sun50i_h6_rtc_clk_init);
-
/*
* The R40 user manual is self-conflicting on whether the prescaler is
* fixed or configurable. The clock diagram shows it as fixed, but there
--
2.33.1
next prev parent reply other threads:[~2022-02-03 2:18 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-03 2:17 [PATCH v3 0/6] clk: sunxi-ng: Add a RTC CCU driver Samuel Holland
2022-02-03 2:17 ` [PATCH v3 1/6] dt-bindings: rtc: sun6i: Clean up repetition Samuel Holland
2022-02-07 8:46 ` Maxime Ripard
2022-02-03 2:17 ` [PATCH v3 2/6] dt-bindings: rtc: sun6i: Add H616, R329, and D1 support Samuel Holland
2022-02-07 8:55 ` Maxime Ripard
2022-02-07 21:45 ` Rob Herring
2022-02-03 2:17 ` [PATCH v3 3/6] rtc: sun6i: Enable the bus clock when provided Samuel Holland
2022-02-07 8:56 ` Maxime Ripard
2022-02-03 2:17 ` [PATCH v3 4/6] clk: sunxi-ng: mux: Allow muxes to have keys Samuel Holland
2022-02-07 9:00 ` (subset) " Maxime Ripard
2022-02-03 2:17 ` [PATCH v3 5/6] clk: sunxi-ng: Add support for the sun6i RTC clocks Samuel Holland
2022-02-07 9:00 ` (subset) " Maxime Ripard
2022-02-07 23:54 ` Samuel Holland
2022-02-11 12:43 ` Maxime Ripard
2022-02-12 23:24 ` Alexandre Belloni
2022-02-18 0:33 ` Stephen Boyd
2022-02-03 2:17 ` Samuel Holland [this message]
2022-02-15 22:16 ` [PATCH v3 0/6] clk: sunxi-ng: Add a RTC CCU driver Alexandre Belloni
2022-03-12 11:29 ` Alexandre Belloni
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=20220203021736.13434-7-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
all inboxes | Powered by JetHome®