Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

thermal/drivers/rcar_gen3: Fix mapping SoCs to generic Gen4 entry

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>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20250911070254.2214-2-wsa+renesas@sang-engineering.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

authored by

Wolfram Sang and committed by
Daniel Lezcano
117bdda2 9d522a87

+6 -6
+6 -6
drivers/thermal/renesas/rcar_gen3_thermal.c
··· 371 371 }, 372 372 }; 373 373 374 - static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_default_info_v4h = { 374 + static const struct rcar_gen3_thermal_fuse_default rcar_gen3_thermal_fuse_default_info_gen4 = { 375 375 .ptat = { 3274, 2164, 985 }, 376 376 .thcodes = { /* All four THS units share the same trimming */ 377 377 { 3218, 2617, 1980 }, ··· 397 397 .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3, 398 398 }; 399 399 400 - static const struct rcar_thermal_info rcar_gen4_thermal_info = { 400 + static const struct rcar_thermal_info rcar_s4_thermal_info = { 401 401 .scale = 167, 402 402 .adj_below = -41, 403 403 .adj_above = 126, ··· 405 405 .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen3, 406 406 }; 407 407 408 - static const struct rcar_thermal_info rcar_v4h_thermal_info = { 408 + static const struct rcar_thermal_info rcar_gen4_thermal_info = { 409 409 .scale = 167, 410 410 .adj_below = -41, 411 411 .adj_above = 126, 412 412 .fuses = &rcar_gen3_thermal_fuse_info_gen4, 413 - .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_v4h, 413 + .fuse_defaults = &rcar_gen3_thermal_fuse_default_info_gen4, 414 414 }; 415 415 416 416 static const struct of_device_id rcar_gen3_thermal_dt_ids[] = { ··· 452 452 }, 453 453 { 454 454 .compatible = "renesas,r8a779f0-thermal", 455 - .data = &rcar_gen4_thermal_info, 455 + .data = &rcar_s4_thermal_info, 456 456 }, 457 457 { 458 458 .compatible = "renesas,r8a779g0-thermal", 459 - .data = &rcar_v4h_thermal_info, 459 + .data = &rcar_gen4_thermal_info, 460 460 }, 461 461 { 462 462 .compatible = "renesas,r8a779h0-thermal",