[PATCH] clk: rockchip: rk3588: fix mask define for aclk_vop_root

[PATCH] clk: rockchip: rk3588: fix mask define for aclk_vop_root

[Heiko Stuebner]

The mask for aclk_vop_root is 3-bit wide, not 2-bit wide according
to the TRM, so set the mask accordingly.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
---
 arch/arm/include/asm/arch-rockchip/cru_rk3588.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h
index dad484813fa..afce8a44af3 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h
@@ -346,7 +346,7 @@ enum {
 	ACLK_VOP_LOW_ROOT_SEL_100M,
 	ACLK_VOP_LOW_ROOT_SEL_24M,
 	ACLK_VOP_ROOT_SEL_SHIFT			= 5,
-	ACLK_VOP_ROOT_SEL_MASK			= 3 << ACLK_VOP_ROOT_SEL_SHIFT,
+	ACLK_VOP_ROOT_SEL_MASK			= 7 << ACLK_VOP_ROOT_SEL_SHIFT,
 	ACLK_VOP_ROOT_SEL_GPLL			= 0,
 	ACLK_VOP_ROOT_SEL_CPLL,
 	ACLK_VOP_ROOT_SEL_AUPLL,
-- 
2.45.2

Re: [PATCH] clk: rockchip: rk3588: fix mask define for aclk_vop_root

[Quentin Schulz]

Hi Heiko,

On 11/20/24 11:19 AM, Heiko Stuebner wrote:
> The mask for aclk_vop_root is 3-bit wide, not 2-bit wide according
> to the TRM, so set the mask accordingly.
> 
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>

Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>

Was this a drive-by bug fix or did you actually experience some bug? 
Basically trying to figure out if we should push for this being merged 
for 2025.01 or if it's fine if it misses it?

Thanks!
Quentin

Re: [PATCH] clk: rockchip: rk3588: fix mask define for aclk_vop_root

[Heiko Stuebner]

Am Mittwoch, 20. November 2024, 12:13:32 CET schrieb Quentin Schulz:
> On 11/20/24 11:19 AM, Heiko Stuebner wrote:
> > The mask for aclk_vop_root is 3-bit wide, not 2-bit wide according
> > to the TRM, so set the mask accordingly.
> > 
> > Signed-off-by: Heiko Stuebner <heiko@sntech.de>
> 
> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de>
> 
> Was this a drive-by bug fix or did you actually experience some bug? 
> Basically trying to figure out if we should push for this being merged 
> for 2025.01 or if it's fine if it misses it?

on my side, it was a "drive-by" thing and I actually don't remember
anymore, what made me look at that. So I don't experience any
bug on my side.


Heiko

Re: [PATCH] clk: rockchip: rk3588: fix mask define for aclk_vop_root

[Kever Yang]

On 2024/11/20 18:19, Heiko Stuebner wrote:
> The mask for aclk_vop_root is 3-bit wide, not 2-bit wide according
> to the TRM, so set the mask accordingly.
>
> Signed-off-by: Heiko Stuebner <heiko@sntech.de>

There is a same change/fix to vendor U-Boot at 2022.

Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

Thanks,
- Kever

> ---
>   arch/arm/include/asm/arch-rockchip/cru_rk3588.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h
> index dad484813fa..afce8a44af3 100644
> --- a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h
> +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h
> @@ -346,7 +346,7 @@ enum {
>   	ACLK_VOP_LOW_ROOT_SEL_100M,
>   	ACLK_VOP_LOW_ROOT_SEL_24M,
>   	ACLK_VOP_ROOT_SEL_SHIFT			= 5,
> -	ACLK_VOP_ROOT_SEL_MASK			= 3 << ACLK_VOP_ROOT_SEL_SHIFT,
> +	ACLK_VOP_ROOT_SEL_MASK			= 7 << ACLK_VOP_ROOT_SEL_SHIFT,
>   	ACLK_VOP_ROOT_SEL_GPLL			= 0,
>   	ACLK_VOP_ROOT_SEL_CPLL,
>   	ACLK_VOP_ROOT_SEL_AUPLL,