From: Alex Elder <elder@riscstar.com>
To: p.zabel@pengutronix.de, mturquette@baylibre.com,
sboyd@kernel.org, dlan@gentoo.org
Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
heylenay@4d2.org, guodong@riscstar.com, paul.walmsley@sifive.com,
palmer@dabbelt.com, aou@eecs.berkeley.edu,
devicetree@vger.kernel.org, linux-clk@vger.kernel.org,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/7] clk: spacemit: make clocks optional
Date: Thu, 20 Mar 2025 14:44:46 -0500 [thread overview]
Message-ID: <20250320194449.510569-6-elder@riscstar.com> (raw)
In-Reply-To: <20250320194449.510569-1-elder@riscstar.com>
There are some syscon devices that support both clocks and resets,
but for now only their reset functionality is required. Make
defining clocks optional for a SpacemiT CCU, though at least one
clock or at least one reset controller must be defined.
Signed-off-by: Alex Elder <elder@riscstar.com>
---
drivers/clk/spacemit/ccu-k1.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c
index be8abd27753cb..17e321c25959a 100644
--- a/drivers/clk/spacemit/ccu-k1.c
+++ b/drivers/clk/spacemit/ccu-k1.c
@@ -1830,6 +1830,10 @@ static int k1_ccu_register(struct device *dev, struct regmap *regmap,
const struct spacemit_ccu_clk *clk;
int i, ret, max_id = 0;
+ /* Clocks are optional */
+ if (!clks)
+ return 0;
+
for (clk = clks; clk->hw; clk++)
max_id = max(max_id, clk->id);
@@ -1903,7 +1907,7 @@ static int k1_ccu_probe(struct platform_device *pdev)
int ret;
data = of_device_get_match_data(dev);
- if (!data)
+ if (!data || !(data->clk || data->rst_data))
return -EINVAL;
base_regmap = device_node_to_regmap(dev->of_node);
--
2.43.0
WARNING: multiple messages have this Message-ID (diff)
From: Alex Elder <elder@riscstar.com>
To: p.zabel@pengutronix.de, mturquette@baylibre.com,
sboyd@kernel.org, dlan@gentoo.org
Cc: robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org,
heylenay@4d2.org, guodong@riscstar.com, paul.walmsley@sifive.com,
palmer@dabbelt.com, aou@eecs.berkeley.edu,
devicetree@vger.kernel.org, linux-clk@vger.kernel.org,
linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/7] clk: spacemit: make clocks optional
Date: Thu, 20 Mar 2025 14:44:46 -0500 [thread overview]
Message-ID: <20250320194449.510569-6-elder@riscstar.com> (raw)
In-Reply-To: <20250320194449.510569-1-elder@riscstar.com>
There are some syscon devices that support both clocks and resets,
but for now only their reset functionality is required. Make
defining clocks optional for a SpacemiT CCU, though at least one
clock or at least one reset controller must be defined.
Signed-off-by: Alex Elder <elder@riscstar.com>
---
drivers/clk/spacemit/ccu-k1.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/spacemit/ccu-k1.c b/drivers/clk/spacemit/ccu-k1.c
index be8abd27753cb..17e321c25959a 100644
--- a/drivers/clk/spacemit/ccu-k1.c
+++ b/drivers/clk/spacemit/ccu-k1.c
@@ -1830,6 +1830,10 @@ static int k1_ccu_register(struct device *dev, struct regmap *regmap,
const struct spacemit_ccu_clk *clk;
int i, ret, max_id = 0;
+ /* Clocks are optional */
+ if (!clks)
+ return 0;
+
for (clk = clks; clk->hw; clk++)
max_id = max(max_id, clk->id);
@@ -1903,7 +1907,7 @@ static int k1_ccu_probe(struct platform_device *pdev)
int ret;
data = of_device_get_match_data(dev);
- if (!data)
+ if (!data || !(data->clk || data->rst_data))
return -EINVAL;
base_regmap = device_node_to_regmap(dev->of_node);
--
2.43.0
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2025-03-20 19:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-20 19:44 [PATCH 0/7] clk: spacemit: add K1 reset support Alex Elder
2025-03-20 19:44 ` Alex Elder
2025-03-20 19:44 ` [PATCH 1/7] dt-bindings: soc: spacemit: define spacemit,k1-ccu resets Alex Elder
2025-03-20 19:44 ` Alex Elder
2025-03-20 19:44 ` [PATCH 2/7] clk: spacemit: define struct k1_ccu_data Alex Elder
2025-03-20 19:44 ` Alex Elder
2025-03-20 19:44 ` [PATCH 3/7] clk: spacemit: add reset controller support Alex Elder
2025-03-20 19:44 ` Alex Elder
2025-03-20 19:44 ` [PATCH 4/7] clk: spacemit: define existing syscon resets Alex Elder
2025-03-20 19:44 ` Alex Elder
2025-03-20 19:44 ` Alex Elder [this message]
2025-03-20 19:44 ` [PATCH 5/7] clk: spacemit: make clocks optional Alex Elder
2025-03-20 19:44 ` [PATCH 6/7] clk: spacemit: define new syscons with only resets Alex Elder
2025-03-20 19:44 ` Alex Elder
2025-03-20 19:44 ` [PATCH 7/7] riscv: dts: spacemit: add reset support for the K1 SoC Alex Elder
2025-03-20 19:44 ` Alex Elder
2025-03-20 23:21 ` [PATCH 0/7] clk: spacemit: add K1 reset support Yixun Lan
2025-03-20 23:21 ` Yixun Lan
2025-03-21 0:05 ` Alex Elder
2025-03-21 0:05 ` Alex Elder
2025-03-21 0:16 ` Yixun Lan
2025-03-21 0:16 ` Yixun Lan
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=20250320194449.510569-6-elder@riscstar.com \
--to=elder@riscstar.com \
--cc=aou@eecs.berkeley.edu \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=dlan@gentoo.org \
--cc=guodong@riscstar.com \
--cc=heylenay@4d2.org \
--cc=krzk+dt@kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=mturquette@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=palmer@dabbelt.com \
--cc=paul.walmsley@sifive.com \
--cc=robh@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.