From 7a479d4a41c9c410e4f7b466820ca4bff00a04e0 Mon Sep 17 00:00:00 2001 From: Isaac Duarte <31712685+Isaac-Duarte@users.noreply.github.com> Date: Sat, 14 Nov 2026 23:22:02 +0000 Subject: [PATCH] arm64: dts: apple: t6050-j714s: let userspace set the fan speeds Mark both J714s fans apple,fan-manual-control, as the M4 Pro/Max MacBook Pros and the J704 already are, so fanX_target is writable without the unsafe fan_control module parameter, for userspace fan control such as a custom fan curve. The SMC still drives the fans until userspace writes a target, and writing 0 hands a fan back to the firmware. The M5 GPU governor already sets these fans through the same manual mode; a userspace target takes a fan over from it until 0 is written. J716s and J775D are left as they are until their fans are tested the same way. Tested on J714s (7.3.0-36.n1usb) with its installed device tree plus this property and fan_control=N: both fanX_target are 0644, the kernel is not tainted, fan 1 set to 4000 rpm ran at 3996 rpm and returned to firmware control after 0 was written, with no macsmc-hwmon warnings. Both fans are handed back the same way: after a userspace curve that had them at 7833 and 7811 rpm let go, both followed the firmware curve again, idling at 0 rpm and ramping under the next load to 3816/4114, then 4952/5347 rpm. Signed-off-by: Isaac Duarte <31712685+Isaac-Duarte@users.noreply.github.com> --- arch/arm64/boot/dts/apple/t6050-j714s.dts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/apple/t6050-j714s.dts b/arch/arm64/boot/dts/apple/t6050-j714s.dts index cffcd7f743590..b45e33a6d6cd9 100644 --- a/arch/arm64/boot/dts/apple/t6050-j714s.dts +++ b/arch/arm64/boot/dts/apple/t6050-j714s.dts @@ -599,10 +599,10 @@ #include "t6050-j714s-pmp-tunables.dtsi" /* - * SMC sensors, as on J716s: the shared fan, power, voltage and current keys, plus - * every readable float T* key through apple,discover-temperatures in - * t6050-die0.dtsi, labelled with the key name. A key this SMC lacks only drops - * its channel. + * SMC sensors, as on J716s except that userspace may set the fans (below): the + * shared fan, power, voltage and current keys, plus every readable float T* key + * through apple,discover-temperatures in t6050-die0.dtsi, labelled with the key + * name. A key this SMC lacks only drops its channel. * * Discovery refuses to run once any temperature channel exists, so the shared * temperature nodes go (their keys are discovered anyway), and so does @@ -620,13 +620,20 @@ /delete-node/ temperature-TCHP; /delete-node/ temperature-TW0P; - /* The T6050 SMC spells the fan mode keys F0md/F1md. The SMC drives the fans. */ + /* + * The T6050 SMC spells the fan mode keys F0md/F1md. The SMC drives the + * fans (the M5 GPU governor sets them through macsmc_hwmon_fans_request() + * as well); it also accepts a manual speed for both from userspace and + * returns them to firmware control when the request is dropped. + */ fan-F0Ac { apple,fan-mode = "F0md"; + apple,fan-manual-control; }; fan-F1Ac { apple,fan-mode = "F1md"; + apple,fan-manual-control; }; };