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

[Chaoyi Chen]

Hi Shawn,

On 1/12/2026 11:49 AM, Shawn Lin wrote:
> 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 node to fix
> the problem.
> 
> Fixes: e1aaecacfa13 ("soc: rockchip: grf: Add rk3576 default GRF values")
> Signed-off-by: Shawn Lin <shawn.lin at rock-chips.com>
> ---
> 
>  drivers/soc/rockchip/grf.c | 59 +++++++++++++++++++++++-----------------------
>  1 file changed, 30 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/soc/rockchip/grf.c b/drivers/soc/rockchip/grf.c
> index 8974d1c..6d1c624e 100644
> --- a/drivers/soc/rockchip/grf.c
> +++ b/drivers/soc/rockchip/grf.c
> @@ -213,40 +213,41 @@ static int __init rockchip_grf_init(void)
>  {
>  	const struct rockchip_grf_info *grf_info;
>  	const struct of_device_id *match;
> -	struct device_node *np;
> +	struct device_node *np, *from_np = NULL;
>  	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__);
> -		of_node_put(np);
> -		return -EINVAL;
> -	}
> +	while (1) {
> +		np = of_find_matching_node_and_match(from_np,
> +				rockchip_grf_dt_match, &match);
> +		if (!np)
> +			return 0;
> +		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);
> -	if (IS_ERR(grf)) {
> -		pr_err("%s: could not get grf syscon\n", __func__);
> -		return PTR_ERR(grf);
> -	}
> +		grf_info = match->data;
>  
> -	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);
> +		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_info("%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);
> +		}
> +		from_np = np;
>  	}

You called of_node_put() on from_np/np here, and the next time
of_find_matching_node_and_match() is called, this function will
internally call of_node_put() on from_np. 

Would this cause a double put?

-- 
Best, 
Chaoyi