mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 3/6] rtc: sun6i: Enable the bus clock when provided
Date: Wed,  2 Feb 2022 20:17:33 -0600	[thread overview]
Message-ID: <20220203021736.13434-4-samuel@sholland.org> (raw)
In-Reply-To: <20220203021736.13434-1-samuel@sholland.org>

H6 and newer variants of the RTC hardware have a bus clock gate in the
PRCM CCU. This was not known at the time H6 support was added, so it was
not included in the H6 RTC binding, nor in the H6 PRCM CCU driver. Now
that this clock gate is documented, it is included in the A100 and D1
PRCM CCU drivers. Therefore, the RTC driver needs to have a consumer for
the clock gate to prevent Linux from disabling it.

Patch-changes: 3
 - New patch for compatibility with new CCU drivers

Signed-off-by: Samuel Holland <samuel@sholland.org>
---

(no changes since v1)

 drivers/rtc/rtc-sun6i.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c
index 711832c758ae..d5a86cbb2e94 100644
--- a/drivers/rtc/rtc-sun6i.c
+++ b/drivers/rtc/rtc-sun6i.c
@@ -668,11 +668,35 @@ static int sun6i_rtc_resume(struct device *dev)
 static SIMPLE_DEV_PM_OPS(sun6i_rtc_pm_ops,
 	sun6i_rtc_suspend, sun6i_rtc_resume);
 
+static void sun6i_rtc_bus_clk_cleanup(void *data)
+{
+	struct clk *bus_clk = data;
+
+	clk_disable_unprepare(bus_clk);
+}
+
 static int sun6i_rtc_probe(struct platform_device *pdev)
 {
 	struct sun6i_rtc_dev *chip = sun6i_rtc;
+	struct device *dev = &pdev->dev;
+	struct clk *bus_clk;
 	int ret;
 
+	bus_clk = devm_clk_get_optional(dev, "bus");
+	if (IS_ERR(bus_clk))
+		return PTR_ERR(bus_clk);
+
+	if (bus_clk) {
+		ret = clk_prepare_enable(bus_clk);
+		if (ret)
+			return ret;
+
+		ret = devm_add_action_or_reset(dev, sun6i_rtc_bus_clk_cleanup,
+					       bus_clk);
+		if (ret)
+			return ret;
+	}
+
 	if (!chip) {
 		chip = devm_kzalloc(&pdev->dev, sizeof(*chip), GFP_KERNEL);
 		if (!chip)
-- 
2.33.1


  parent reply	other threads:[~2022-02-03  2:17 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 ` Samuel Holland [this message]
2022-02-07  8:56   ` [PATCH v3 3/6] rtc: sun6i: Enable the bus clock when provided 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 ` [PATCH v3 6/6] [DO NOT MERGE] clk: sunxi-ng: sun6i-rtc: Add support for H6 Samuel Holland
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-4-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®