[PATCH v3 2/4] clk: en7523: Add reset-controller support for EN7581 SoC

[AngeloGioacchino Del Regno]

Il 13/06/24 14:47, Lorenzo Bianconi ha scritto:
> Introduce reset API support to EN7581 clock driver.
> 
> Tested-by: Zhengping Zhang <zhengping.zhang at airoha.com>
> Signed-off-by: Lorenzo Bianconi <lorenzo at kernel.org>
> ---
>   drivers/clk/clk-en7523.c | 200 ++++++++++++++++++++++++++++++++++++++-
>   1 file changed, 197 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/clk/clk-en7523.c b/drivers/clk/clk-en7523.c
> index ccc394692671..00638714fe08 100644
> --- a/drivers/clk/clk-en7523.c
> +++ b/drivers/clk/clk-en7523.c

..snip..

> @@ -423,6 +505,102 @@ static void en7523_register_clocks(struct device *dev, struct clk_hw_onecell_dat
>   	clk_data->num = EN7523_NUM_CLOCKS;
>   }
>   
> +static int en7523_reset_update(struct reset_controller_dev *rcdev,
> +			       unsigned long id, bool assert)
> +{
> +	struct en_rst_data *rst_data;
> +	void __iomem *addr;

struct en_rst_data *rst_data = container_of(rcdev, struct en_rst_data, rcdev);
void __iomem *addr = rst_data->base + rst_data->bank_ofs[id / RST_NR_PER_BANK];
u32 val;

val = readl(addr);
etc etc

> +	u32 val;
> +
> +	rst_data = container_of(rcdev, struct en_rst_data, rcdev);
> +	addr = rst_data->base + rst_data->bank_ofs[id / RST_NR_PER_BANK];
> +
> +	val = readl(addr);
> +	if (assert)
> +		val |= BIT(id % RST_NR_PER_BANK);
> +	else
> +		val &= ~BIT(id % RST_NR_PER_BANK);
> +	writel(val, addr);
> +
> +	return 0;
> +}
> +
> +static int en7523_reset_assert(struct reset_controller_dev *rcdev,
> +			       unsigned long id)
> +{
> +	return en7523_reset_update(rcdev, id, true);
> +}
> +
> +static int en7523_reset_deassert(struct reset_controller_dev *rcdev,
> +				 unsigned long id)
> +{
> +	return en7523_reset_update(rcdev, id, false);
> +}
> +
> +static int en7523_reset_status(struct reset_controller_dev *rcdev,
> +			       unsigned long id)
> +{
> +	struct en_rst_data *rst_data;
> +	void __iomem *addr;
> +
> +	rst_data = container_of(rcdev, struct en_rst_data, rcdev);
> +	addr = rst_data->base + rst_data->bank_ofs[id / RST_NR_PER_BANK];

same here, just init while declaring.

> +
> +	return !!(readl(addr) & BIT(id % RST_NR_PER_BANK));
> +}
> +
> +static int en7523_reset_xlate(struct reset_controller_dev *rcdev,
> +			      const struct of_phandle_args *reset_spec)
> +{
> +	struct en_rst_data *rst_data;
> +
> +	rst_data = container_of(rcdev, struct en_rst_data, rcdev);

ditto

> +	if (reset_spec->args[0] >= rcdev->nr_resets)
> +		return -EINVAL;
> +
> +	return rst_data->idx_map[reset_spec->args[0]];
> +}
> +
> +static const struct reset_control_ops en7523_reset_ops = {
> +	.assert = en7523_reset_assert,
> +	.deassert = en7523_reset_deassert,
> +	.status = en7523_reset_status,
> +};
> +
> +static int en7523_reset_register(struct platform_device *pdev,
> +				 const struct en_clk_soc_data *soc_data)
> +{
> +	struct device *dev = &pdev->dev;
> +	struct en_rst_data *rst_data;
> +	void __iomem *base;
> +
> +	/* no reset lines available */
> +	if (!soc_data->reset.idx_map_nr)
> +		return 0;
> +
> +	base = devm_platform_ioremap_resource(pdev, 2);
> +	if (IS_ERR(base))
> +		return PTR_ERR(base);
> +
> +	rst_data = devm_kzalloc(dev, sizeof(*rst_data), GFP_KERNEL);
> +	if (!rst_data)
> +		return -ENOMEM;
> +
> +	rst_data->bank_ofs = soc_data->reset.bank_ofs;
> +	rst_data->idx_map = soc_data->reset.idx_map;
> +	rst_data->base = base;
> +
> +	rst_data->rcdev.nr_resets = soc_data->reset.idx_map_nr;
> +	rst_data->rcdev.of_xlate = en7523_reset_xlate;
> +	rst_data->rcdev.ops = &en7523_reset_ops;
> +	rst_data->rcdev.of_node = dev->of_node;
> +	rst_data->rcdev.of_reset_n_cells = 1;
> +	rst_data->rcdev.owner = THIS_MODULE;
> +	rst_data->rcdev.dev = dev;
> +
> +	return devm_reset_controller_register(dev, &rst_data->rcdev);
> +}
> +
>   static int en7523_clk_probe(struct platform_device *pdev)
>   {
>   	struct device_node *node = pdev->dev.of_node;
> @@ -455,12 +633,23 @@ static int en7523_clk_probe(struct platform_device *pdev)
>   	en7523_register_clocks(&pdev->dev, clk_data, base, np_base);
>   
>   	r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data);
> -	if (r)
> +	if (r) {

it's simpler if you just use dev_err_probe() at this point...

if (r)
	return dev_err_probe(.......)

>   		dev_err(&pdev->dev,
>   			"could not register clock provider: %s: %d\n",
>   			pdev->name, r);
> +		return r;
> +	}
>   
> -	return r;
> +	r = en7523_reset_register(pdev, soc_data);
> +	if (r) {

if (r) {
	of_clk_del_provider....
	return dev_err_probe(......)
};

after which

Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno at collabora.com>