The StarFive JHB100 SoC has several clock and reset generators (CRGs) which share the same probe flow: map the registers, register all the clocks described by a table, add the clock provider and register the auxiliary reset device.
Add jh71x0_crg_probe() together with struct jh71x0_crg_domain_info so that each CRG driver only needs to provide its clock table, external clock names and reset auxiliary device name. The reset auxiliary device is registered with jh71x0_reset_controller_register(). The clock index space of these CRGs is sparse, so also make jh71x0_clk_get() reject indexes that were never registered when the domain info is available. Signed-off-by: Changhuang Liang <[email protected]> --- drivers/clk/starfive/clk-starfive-jh71x0.c | 95 +++++++++++++++++++++- drivers/clk/starfive/clk-starfive-jh71x0.h | 12 +++ 2 files changed, 104 insertions(+), 3 deletions(-) diff --git a/drivers/clk/starfive/clk-starfive-jh71x0.c b/drivers/clk/starfive/clk-starfive-jh71x0.c index 2cc71f49ddee..bb7706ede1a6 100644 --- a/drivers/clk/starfive/clk-starfive-jh71x0.c +++ b/drivers/clk/starfive/clk-starfive-jh71x0.c @@ -10,6 +10,7 @@ #include <linux/debugfs.h> #include <linux/device.h> #include <linux/io.h> +#include <linux/pm_runtime.h> #include <linux/slab.h> #include <soc/starfive/reset-starfive-jh71x0.h> @@ -334,10 +335,14 @@ struct clk_hw *jh71x0_clk_get(struct of_phandle_args *clkspec, void *data) struct jh71x0_clk_priv *priv = data; unsigned int idx = clkspec->args[0]; - if (idx < priv->num_reg) - return &priv->reg[idx].hw; + if (idx >= priv->num_reg) + return ERR_PTR(-EINVAL); - return ERR_PTR(-EINVAL); + /* Index space is sparse: reject holes that were never registered. */ + if (priv->info && !priv->info->clk_data[idx].name) + return ERR_PTR(-ENOENT); + + return &priv->reg[idx].hw; } EXPORT_SYMBOL_GPL(jh71x0_clk_get); @@ -391,3 +396,87 @@ int jh71x0_reset_controller_register(struct jh71x0_clk_priv *priv, jh71x0_reset_unregister_adev, adev); } EXPORT_SYMBOL_GPL(jh71x0_reset_controller_register); + +int jh71x0_crg_probe(struct platform_device *pdev) +{ + const struct jh71x0_crg_domain_info *info; + struct jh71x0_clk_priv *priv; + unsigned int idx; + int ret; + + info = device_get_match_data(&pdev->dev); + if (!info) + return -ENODEV; + + priv = devm_kzalloc(&pdev->dev, struct_size(priv, reg, info->num_clk), + GFP_KERNEL); + if (!priv) + return -ENOMEM; + + spin_lock_init(&priv->rmw_lock); + priv->info = info; + priv->num_reg = info->num_clk; + priv->dev = &pdev->dev; + priv->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(priv->base)) + return PTR_ERR(priv->base); + + if (info->power_domain) { + ret = devm_pm_runtime_enable(priv->dev); + if (ret) + return dev_err_probe(priv->dev, ret, + "failed to enable runtime PM\n"); + } + + for (idx = 0; idx < info->num_clk; idx++) { + u32 max = info->clk_data[idx].max; + struct clk_parent_data parents[4] = {}; + struct clk_init_data init = { + .name = info->clk_data[idx].name, + .ops = starfive_jh71x0_clk_ops(max), + .parent_data = parents, + .num_parents = + ((max & JH71X0_CLK_MUX_MASK) >> JH71X0_CLK_MUX_SHIFT) + 1, + .flags = info->clk_data[idx].flags, + }; + struct jh71x0_clk *clk = &priv->reg[idx]; + unsigned int i; + + if (!init.name) + continue; + + if (init.num_parents > ARRAY_SIZE(parents)) + return dev_err_probe(priv->dev, -EINVAL, + "clock %s: too many parents (%u > %zu)\n", + init.name, init.num_parents, ARRAY_SIZE(parents)); + + for (i = 0; i < init.num_parents; i++) { + unsigned int pidx = info->clk_data[idx].parents[i]; + + if (pidx < info->num_clk) { + parents[i].hw = &priv->reg[pidx].hw; + } else { + if (pidx - info->num_clk >= info->num_ext_clk) + return -EINVAL; + + parents[i].fw_name = info->ext_clk[pidx - info->num_clk]; + } + } + + clk->hw.init = &init; + clk->idx = idx; + clk->max_div = max & JH71X0_CLK_DIV_MASK; + + ret = devm_clk_hw_register(&pdev->dev, &clk->hw); + if (ret) + return dev_err_probe(priv->dev, ret, "Failed to register clock %s\n", + init.name); + } + + ret = devm_of_clk_add_hw_provider(&pdev->dev, jh71x0_clk_get, priv); + if (ret) + return ret; + + return jh71x0_reset_controller_register(priv, info->rst_name); +} +EXPORT_SYMBOL_GPL(jh71x0_crg_probe); diff --git a/drivers/clk/starfive/clk-starfive-jh71x0.h b/drivers/clk/starfive/clk-starfive-jh71x0.h index 322a05157faf..2a1f0fb4cbb1 100644 --- a/drivers/clk/starfive/clk-starfive-jh71x0.h +++ b/drivers/clk/starfive/clk-starfive-jh71x0.h @@ -5,6 +5,7 @@ #include <linux/bits.h> #include <linux/clk-provider.h> #include <linux/device.h> +#include <linux/platform_device.h> #include <linux/spinlock.h> /* register fields */ @@ -109,6 +110,15 @@ struct jh71x0_clk { unsigned int max_div; }; +struct jh71x0_crg_domain_info { + const struct jh71x0_clk_data *clk_data; + unsigned int num_clk; + const char * const *ext_clk; + unsigned int num_ext_clk; + const char *rst_name; + bool power_domain; +}; + struct jh71x0_clk_priv { /* protect clk enable and set rate/parent from happening at the same time */ spinlock_t rmw_lock; @@ -116,6 +126,7 @@ struct jh71x0_clk_priv { void __iomem *base; struct clk *original_clk; struct notifier_block pll_clk_nb; + const struct jh71x0_crg_domain_info *info; struct clk_hw *pll[3]; unsigned int num_reg; struct jh71x0_clk reg[] __counted_by(num_reg); @@ -125,5 +136,6 @@ const struct clk_ops *starfive_jh71x0_clk_ops(u32 max); struct clk_hw *jh71x0_clk_get(struct of_phandle_args *clkspec, void *data); int jh71x0_reset_controller_register(struct jh71x0_clk_priv *priv, const char *adev_name); +int jh71x0_crg_probe(struct platform_device *pdev); #endif -- 2.25.1
