Re: [RFC PATCH 1/2] thermal/drivers/rcar_gen3: fix mapping SoCs to generic Gen4 entry

Niklas Söderlund
2025-09-09T14:46:35Z

Hi Wolfram,

Thanks for your work.

On 2025-09-09 10:46:19 +0200, Wolfram Sang wrote:
> S4 was added first so it was assumed to be the blueprint for R-Car Gen4.
> It turned out now, that S4 is a special mix between Gen3 and Gen4. V4H
> and V4M are the similar ones as confirmed by HW engineers.
>
> So, rename the S4 entry to be specific instead of generic. Rename the
> V4H entry to be the new generic one, so V4M will use it as well now.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

Good catch,

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

> ---
> drivers/thermal/renesas/rcar_gen3_thermal.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/thermal/renesas/rcar_gen3_thermal.c b/drivers/thermal/renesas/rcar_gen3_thermal.c
> index 01858e72f4e0..07b53d4f2683 100644
> --- a/drivers/thermal/renesas/rcar_gen3_thermal.c
> +++ b/drivers/thermal/renesas/rcar_gen3_thermal.c
> @@ -371,7 +371,7 @@ static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_defaul
> },
> };
>
> -static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_default_info_v4h = {
> +static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_default_info_gen4 = {
> .ptat = { 3274, 2164, 985 },
> .thcodes = { /* All four THS units share the same trimming */
> { 3218, 2617, 1980 },
> @@ -397,7 +397,7 @@ static const struct rcar_thermal_info rcar_gen3_thermal_info = {
> .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3,
> };
>
> -static const struct rcar_thermal_info rcar_gen4_thermal_info = {
> +static const struct rcar_thermal_info rcar_s4_thermal_info = {
> .scale = 167,
> .adj_below = -41,
> .adj_above = 126,
> @@ -405,12 +405,12 @@ static const struct rcar_thermal_info rcar_gen4_thermal_info = {
> .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3,
> };
>
> -static const struct rcar_thermal_info rcar_v4h_thermal_info = {
> +static const struct rcar_thermal_info rcar_gen4_thermal_info = {
> .scale = 167,
> .adj_below = -41,
> .adj_above = 126,
> .fuses = &rcar_gen3_thermal_fuse_info_gen4,
> - .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_v4h,
> + .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen4,
> };
>
> static const struct of_device_id rcar_gen3_thermal_dt_ids[] = {
> @@ -452,11 +452,11 @@ static const struct of_device_id rcar_gen3_thermal_dt_ids[] = {
> },
> {
> .compatible = "renesas,r8a779f0-thermal",
> - .data = &rcar_gen4_thermal_info,
> + .data = &rcar_s4_thermal_info,
> },
> {
> .compatible = "renesas,r8a779g0-thermal",
> - .data = &rcar_v4h_thermal_info,
> + .data = &rcar_gen4_thermal_info,
> },
> {
> .compatible = "renesas,r8a779h0-thermal",
> --
> 2.47.2
>

--
Kind Regards,
Niklas Söderlund