Patch "clk: rockchip: fix finding of maximum clock ID" has been added to the 6.11-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    clk: rockchip: fix finding of maximum clock ID

to the 6.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     clk-rockchip-fix-finding-of-maximum-clock-id.patch
and it can be found in the queue-6.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 817e55746382df4cb09ce77167e6fb78a93fe33d
Author: Yao Zi <ziyao@xxxxxxxxxxx>
Date:   Thu Sep 12 13:32:05 2024 +0000

    clk: rockchip: fix finding of maximum clock ID
    
    [ Upstream commit ad1081a0da2744141d12e94ff816ac91feb871ca ]
    
    If an ID of a branch's child is greater than current maximum, we should
    set new maximum to the child's ID, instead of its parent's.
    
    Fixes: 2dc66a5ab2c6 ("clk: rockchip: rk3588: fix CLK_NR_CLKS usage")
    Signed-off-by: Yao Zi <ziyao@xxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20240912133204.29089-2-ziyao@xxxxxxxxxxx
    Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
    Reviewed-by: Heiko Stuebner <heiko@xxxxxxxxx>
    Signed-off-by: Stephen Boyd <sboyd@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index 2fa7253c73b2c..88629a9abc9c9 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -439,7 +439,7 @@ unsigned long rockchip_clk_find_max_clk_id(struct rockchip_clk_branch *list,
 		if (list->id > max)
 			max = list->id;
 		if (list->child && list->child->id > max)
-			max = list->id;
+			max = list->child->id;
 	}
 
 	return max;