[PATCH v2 2/3] soc: rockchip: grf: Support multiple grf to be handled

[Heiko Stübner]

Hi Shawn,

Am Dienstag, 13. Januar 2026, 02:18:24 Mitteleuropäische Normalzeit schrieb Shawn Lin:
> Currently, only the first matched node will be handled. This leads
> to jtag switching broken for RK3576, as rk3576-sys-grf is found before
> rk3576-ioc-grf. Change the code to scan all the possible nodes to fix
> the problem.
> 
> Fixes: e1aaecacfa13 ("soc: rockchip: grf: Add rk3576 default GRF values")
> Cc: Detlev Casanova <detlev.casanova at collabora.com>
> Signed-off-by: Shawn Lin <shawn.lin at rock-chips.com>
> ---
> 
> Changes in v2:
> - use for_each_matching_node_and_match(Heiko)
> 
>  drivers/soc/rockchip/grf.c | 54 +++++++++++++++++++++++-----------------------
>  1 file changed, 27 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c
> index 8974d1c..9b36390 100644
> --- a/drivers/soc/rockchip/grf.c
> +++ b/drivers/soc/rockchip/grf.c
> @@ -217,34 +217,34 @@ static int __init rockchip_grf_init(void)
>  	struct regmap *grf;
>  	int ret, i;
>  
> -	np = of_find_matching_node_and_match(NULL, rockchip_grf_dt_match,
> -					     &match);
> -	if (!np)
> -		return -ENODEV;
> -	if (!match || !match->data) {
> -		pr_err("%s: missing grf data\n", __func__);
> +	for_each_matching_node_and_match(np, rockchip_grf_dt_match, &match) {
> +		if (!of_device_is_available(np))
> +			continue;
> +		if (!match || !match->data) {
> +			pr_err("%s: missing grf data\n", __func__);
> +			of_node_put(np);
> +			return -EINVAL;
> +		}
> +
> +		grf_info = match->data;
> +
> +		grf = syscon_node_to_regmap(np);
>  		of_node_put(np);

This of_node_put can go away I think.

for_each_matching_node_and_match iterates over the nodes via 
	of_find_matching_node_and_match(dn, matches, match)   [0]

and of_find_matching_node_and_match() will of_node_put() the from node [1]


Heiko

[0] https://elixir.bootlin.com/linux/v6.18.4/source/include/linux/of.h#L1469
[1] https://elixir.bootlin.com/linux/v6.18.4/source/drivers/of/base.c#L1147

> -		return -EINVAL;
> -	}
> -
> -	grf_info = match->data;
> -
> -	grf = syscon_node_to_regmap(np);
> -	of_node_put(np);
> -	if (IS_ERR(grf)) {
> -		pr_err("%s: could not get grf syscon\n", __func__);
> -		return PTR_ERR(grf);
> -	}
> -
> -	for (i = 0; i < grf_info->num_values; i++) {
> -		const struct rockchip_grf_value *val = &grf_info->values[i];
> -
> -		pr_debug("%s: adjusting %s in %#6x to %#10x\n", __func__,
> -			val->desc, val->reg, val->val);
> -		ret = regmap_write(grf, val->reg, val->val);
> -		if (ret < 0)
> -			pr_err("%s: write to %#6x failed with %d\n",
> -			       __func__, val->reg, ret);
> +		if (IS_ERR(grf)) {
> +			pr_err("%s: could not get grf syscon\n", __func__);
> +			return PTR_ERR(grf);
> +		}
> +
> +		for (i = 0; i < grf_info->num_values; i++) {
> +			const struct rockchip_grf_value *val = &grf_info->values[i];
> +
> +			pr_debug("%s: adjusting %s in %#6x to %#10x\n", __func__,
> +				val->desc, val->reg, val->val);
> +			ret = regmap_write(grf, val->reg, val->val);
> +			if (ret < 0)
> +				pr_err("%s: write to %#6x failed with %d\n",
> +					__func__, val->reg, ret);
> +		}
>  	}
>  
>  	return 0;
>