linux-rtc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Chen-Yu Tsai <wens@csie.org>
To: Maxime Ripard <maxime.ripard@bootlin.com>,
	Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Alessandro Zummo <a.zummo@towertech.it>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>, Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Cc: Chen-Yu Tsai <wens@csie.org>,
	linux-arm-kernel@lists.infradead.org, linux-rtc@vger.kernel.org,
	linux-clk@vger.kernel.org, devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com
Subject: [PATCH 08/15] rtc: sun6i: Expose internal oscillator through device tree
Date: Wed, 28 Nov 2018 17:30:06 +0800	[thread overview]
Message-ID: <20181128093013.24442-10-wens@csie.org> (raw)
In-Reply-To: <20181128093013.24442-1-wens@csie.org>

The bindings have been updated to expose the RTC's internal oscillator,
for some SoCs that have it directly feeding the PRCM block. The changes
include the index 2 for the clock outputs, as well as the clock output
names.

This patch adds the internal oscillator to the list of clocks exposed
through of_clk_add_hw_provider(), and also have the driver optionally
fetch the name of the clock from the device tree if it's available.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/rtc/rtc-sun6i.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index 62ed9ce53d8c..273ab7fbbbe3 100644
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -220,6 +220,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 		.ops		= &sun6i_rtc_osc_ops,
 		.name		= "losc",
 	};
+	const char *iosc_name = "rtc-int-osc";
 	const char *clkout_name = "osc32k-out";
 	const char *parents[2];
 
@@ -228,7 +229,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 		return;
 
 	rtc->data = data;
-	clk_data = kzalloc(struct_size(clk_data, hws, 2), GFP_KERNEL);
+	clk_data = kzalloc(struct_size(clk_data, hws, 3), GFP_KERNEL);
 	if (!clk_data) {
 		kfree(rtc);
 		return;
@@ -253,8 +254,10 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 	if (!of_get_property(node, "clocks", NULL))
 		goto err;
 
+	of_property_read_string_index(node, "clock-output-names", 2,
+				      &iosc_name);
 	rtc->int_osc = clk_hw_register_fixed_rate_with_accuracy(NULL,
-								"rtc-int-osc",
+								iosc_name,
 								NULL, 0,
 								rtc->data->rc_osc_rate,
 								300000000);
@@ -290,9 +293,10 @@ static void __init sun6i_rtc_clk_init(struct device_node *node,
 		return;
 	}
 
-	clk_data->num = 2;
+	clk_data->num = 3;
 	clk_data->hws[0] = &rtc->hw;
 	clk_data->hws[1] = __clk_get_hw(rtc->ext_losc);
+	clk_data->hws[2] = rtc->int_osc;
 	of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
 	return;
 
-- 
2.20.0.rc1


  parent reply	other threads:[~2018-11-28  9:37 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-11-28  9:29 [PATCH 00/15] rtc: sun6i: clock rework and pre-H6 SoC support Chen-Yu Tsai
2018-11-28  9:29 ` [PATCH 01/15] dt-bindings: rtc: sun6i-rtc: Rewrite clock outputs as a list Chen-Yu Tsai
2018-11-28 10:17   ` Maxime Ripard
2018-11-28  9:29 ` [PATCH 02/15] dt-bindings: rtc: sun6i-rtc: Add compatible strings for pre-H6 variants Chen-Yu Tsai
2018-11-28 10:19   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 03/15] dt-bindings: rtc: sun6i-rtc: Deprecate external clock output for A31 Chen-Yu Tsai
2018-11-28 10:20   ` Maxime Ripard
2018-11-28 11:15     ` Chen-Yu Tsai
2018-11-28  9:30 ` [PATCH 04/15] dt-bindings: rtc: sun6i-rtc: Export internal RC oscillator Chen-Yu Tsai
2018-11-28 10:32   ` Maxime Ripard
2018-11-28 11:18     ` Chen-Yu Tsai
2018-12-03  9:06       ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 05/15] rtc: sun6i: Add default clock name for LOSC Chen-Yu Tsai
2018-11-28 10:21   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 06/15] rtc: sun6i: Add support for different variants Chen-Yu Tsai
2018-11-28 10:22   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 07/15] rtc: sun6i: Add support for all known pre-H6 variants Chen-Yu Tsai
2018-11-28 10:24   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 07/15] rtc: sun6i: Add support for all known variants Chen-Yu Tsai
2018-11-28  9:44   ` [linux-sunxi] " Chen-Yu Tsai
2018-11-28  9:30 ` Chen-Yu Tsai [this message]
2018-11-28 10:33   ` [PATCH 08/15] rtc: sun6i: Expose internal oscillator through device tree Maxime Ripard
2018-11-28  9:30 ` [PATCH 09/15] clk: sunxi-ng: r40: Force LOSC parent to RTC LOSC output Chen-Yu Tsai
2018-11-28 10:25   ` Maxime Ripard
2018-11-28 21:29   ` Stephen Boyd
2018-11-30  3:55     ` Chen-Yu Tsai
2018-11-28  9:30 ` [PATCH 10/15] ARM: dts: sun8i: a23/a33: Fix up RTC device node Chen-Yu Tsai
2018-11-28 10:26   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 11/15] ARM: dts: sunxi: h3/h5: Add clock accuracy for external oscillators Chen-Yu Tsai
2018-11-28 10:26   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 12/15] ARM: dts: sunxi: h3/h5: Fix up RTC device node and clock references Chen-Yu Tsai
2018-11-28 10:27   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 13/15] ARM: dts: sun8i: r40: Add clock accuracy for external oscillators Chen-Yu Tsai
2018-11-28 10:28   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 14/15] ARM: dts: sun8i: r40: Add RTC device node Chen-Yu Tsai
2018-11-28 10:28   ` Maxime Ripard
2018-11-28  9:30 ` [PATCH 15/15] arm64: dts: allwinner: a64: Fix up RTC device node and clock references Chen-Yu Tsai
2018-11-28 10:28   ` Maxime Ripard
2018-11-28 18:45 ` [linux-sunxi] [PATCH 00/15] rtc: sun6i: clock rework and pre-H6 SoC support Corentin Labbe

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=20181128093013.24442-10-wens@csie.org \
    --to=wens@csie.org \
    --cc=a.zummo@towertech.it \
    --cc=alexandre.belloni@bootlin.com \
    --cc=devicetree@vger.kernel.org \
    --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@googlegroups.com \
    --cc=mark.rutland@arm.com \
    --cc=maxime.ripard@bootlin.com \
    --cc=mturquette@baylibre.com \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@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).