[PATCH v14 4/5] clk: en7523: generalize register clocks function
From: Christian Marangi
Date: Fri Nov 20 2026 - 18:36:29 EST
Airoha AN7583 SoC will use the same logic used by Airoha EN7581 SoC to
register clocks. Generalize it to register clocks defined in soc_data.
Add the clocks definition in EN7581 SoC to support this new implementation.
Rework the .num_clocks value to declare the number of base clocks and
increase internally if PCIe OPs is_enabled is defined.
EN751221 is updated to address the new num_clocks meaning.
Signed-off-by: Christian Marangi <ansuelsmth@xxxxxxxxx>
---
drivers/clk/clk-en7523.c | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c
index 12a43562929b..a4a75b8063a5 100644
--- a/drivers/clk/clk-en7523.c
+++ b/drivers/clk/clk-en7523.c
@@ -147,6 +147,7 @@ struct en_clk_priv {
struct en_clk_soc_data {
u32 num_clocks;
+ const struct en_clk_desc *base_clks;
const struct clk_ops pcie_ops;
int (*hw_init)(struct platform_device *pdev,
struct clk_hw_onecell_data *clk_data);
@@ -799,12 +800,15 @@ static int en7523_clk_hw_init(struct platform_device *pdev,
static void en7581_register_clocks(struct device *dev, struct clk_hw_onecell_data *clk_data,
struct regmap *map, void __iomem *base)
{
+ const struct en_clk_soc_data *soc_data;
struct clk_hw *hw;
u32 rate;
int i;
- for (i = 0; i < ARRAY_SIZE(en7581_base_clks); i++) {
- const struct en_clk_desc *desc = &en7581_base_clks[i];
+ soc_data = device_get_match_data(dev);
+
+ for (i = 0; i < soc_data->num_clocks; i++) {
+ const struct en_clk_desc *desc = &soc_data->base_clks[i];
u32 val, reg = desc->div_reg ? desc->div_reg : desc->base_reg;
int err;
@@ -1245,7 +1249,7 @@ static int en7523_clk_probe(struct platform_device *pdev)
const struct en_clk_soc_data *soc_data;
struct clk_hw_onecell_data *clk_data;
struct en_clk_priv *priv;
- int r;
+ int num_clocks, r;
soc_data = device_get_match_data(&pdev->dev);
@@ -1255,14 +1259,18 @@ static int en7523_clk_probe(struct platform_device *pdev)
spin_lock_init(&priv->lock);
- clk_data = devm_kzalloc_flex(&pdev->dev, *clk_data, hws,
- soc_data->num_clocks);
+ num_clocks = soc_data->num_clocks;
+ /* Num clocks are incremented by 1 if PCIe clock is supported */
+ if (soc_data->pcie_ops.is_enabled)
+ num_clocks++;
+
+ clk_data = devm_kzalloc_flex(&pdev->dev, *clk_data, hws, num_clocks);
if (!clk_data)
return -ENOMEM;
platform_set_drvdata(pdev, priv);
- clk_data->num = soc_data->num_clocks;
+ clk_data->num = num_clocks;
r = soc_data->hw_init(pdev, clk_data);
if (r)
return r;
@@ -1271,7 +1279,7 @@ static int en7523_clk_probe(struct platform_device *pdev)
}
static const struct en_clk_soc_data en7523_data = {
- .num_clocks = ARRAY_SIZE(en7523_base_clks) + 1,
+ .num_clocks = ARRAY_SIZE(en7523_base_clks),
.pcie_ops = {
.is_enabled = en7523_pci_is_enabled,
.prepare = en7523_pci_prepare,
@@ -1282,8 +1290,8 @@ static const struct en_clk_soc_data en7523_data = {
};
static const struct en_clk_soc_data en7581_data = {
- /* We increment num_clocks by 1 to account for additional PCIe clock */
- .num_clocks = ARRAY_SIZE(en7581_base_clks) + 1,
+ .base_clks = en7581_base_clks,
+ .num_clocks = ARRAY_SIZE(en7581_base_clks),
.pcie_ops = {
.is_enabled = en7581_pci_is_enabled,
.enable = en7581_pci_enable,
@@ -1293,7 +1301,8 @@ static const struct en_clk_soc_data en7581_data = {
};
static const struct en_clk_soc_data en751221_data = {
- .num_clocks = EN751221_MAX_CLKS,
+ /* Decrease of one as PCIe is incremented internally with PCIe OPs */
+ .num_clocks = EN751221_MAX_CLKS - 1,
.pcie_ops = {
.is_enabled = en7523_pci_is_enabled,
.prepare = en7523_pci_prepare,
--
2.55.0