[PATCH v6 1/7] thermal: rockchip: rename rk_tsadcv3_tshut_mode

[Heiko Stuebner]

Am Dienstag, 10. Juni 2025, 14:32:37 Mitteleuropäische Sommerzeit schrieb Nicolas Frattaroli:
> The "v" version specifier here refers to the hardware IP revision.
> Mainline deviated from downstream here by calling the v4 revision v3 as
> it didn't support the v3 hardware revision at all.
> 
> This creates needless confusion, so rename it to rk_tsadcv4_tshut_mode
> to be consistent with what the hardware wants to be called.
> 
> Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli at collabora.com>

Reviewed-by: Heiko Stuebner <heiko at sntech.de>

I checked the vendor-kernel, and your're right the
rv1126 gets identified as v3 it seems, while all of rk35xx except rk3568
(= rk3506, rk3528, rk3562, rk3576, rk3588) call themself v4


> ---
>  drivers/thermal/rockchip_thermal.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
> index a8ad85feb68fbb7ec8d79602b16c47838ecb3c00..40c7d234c3ef99f69dd8db4d8c47f9d493c0583d 100644
> --- a/drivers/thermal/rockchip_thermal.c
> +++ b/drivers/thermal/rockchip_thermal.c
> @@ -1045,7 +1045,7 @@ static void rk_tsadcv2_tshut_mode(int chn, void __iomem *regs,
>  	writel_relaxed(val, regs + TSADCV2_INT_EN);
>  }
>  
> -static void rk_tsadcv3_tshut_mode(int chn, void __iomem *regs,
> +static void rk_tsadcv4_tshut_mode(int chn, void __iomem *regs,
>  				  enum tshut_mode mode)
>  {
>  	u32 val_gpio, val_cru;
> @@ -1297,7 +1297,7 @@ static const struct rockchip_tsadc_chip rk3588_tsadc_data = {
>  	.get_temp = rk_tsadcv4_get_temp,
>  	.set_alarm_temp = rk_tsadcv3_alarm_temp,
>  	.set_tshut_temp = rk_tsadcv3_tshut_temp,
> -	.set_tshut_mode = rk_tsadcv3_tshut_mode,
> +	.set_tshut_mode = rk_tsadcv4_tshut_mode,
>  	.table = {
>  		.id = rk3588_code_table,
>  		.length = ARRAY_SIZE(rk3588_code_table),
> 
>