Skip to content

arm64: dts: apple: t6050: describe the fans on J775c and J873s - #2397

Draft
RyanTheTide wants to merge 1 commit into
integration/aurorafrom
dtfill-power/fans-t6050-desktop
Draft

RyanTheTide wants to merge 1 commit into
integration/aurorafrom
dtfill-power/fans-t6050-desktop

Conversation

@RyanTheTide

Copy link
Copy Markdown
Contributor

Problem

The Mac Studio (M5 Max, J775c) and the Mac mini (M5 Pro, J873s) have the SMC hwmon node from t6050-die0.dtsi, but no fan or power keys. Neither board shows a fan speed in sensors.

Change

Testing

  • DTB build (cpp + dtc with kbuild flags) for all 11 T6050 boards, before and after: all build, 0 dtc warnings before and after.
  • Byte-identical: J714c, J714s, J716c, J716s, J775d, K114c, K114s, K116c, K116s.
  • Changed: J775c (+2 fan nodes, +PD0R), J873s (+1 fan node, PSTR, PDTR, PMVR, VD0R, ID0R).
  • dt-validate on J775c, J775d, J873s: 0 messages before, 0 after.

Still to run

  • J775c (DjDeveloperr, satchlj): sensors shows "Fan 1" and "Fan 2" with non-zero RPM and "DC Input Power". cat /sys/class/hwmon/hwmon*/fan*_input gives two non-zero values. dmesg | grep -i macsmc shows no "optional keys not found" line and no SMC errors.
  • J873s (no known owner): sensors shows "Fan" with RPM (it may read 0 at idle if the fan is stopped) and the discovered T* keys. cat /sys/class/hwmon/hwmon*/fan1_input gives a value. dmesg has no "optional keys not found" line for F0Ac. Also check whether PSTR/PDTR read 0 here as they do on the Studio. If they do, a later change can drop hwmon-common, as on J775d.
  • J775d (funkzy): regression only. sensors shows both fans and "DC Input Power" as before. The DTB is byte-identical, so no change is expected.

This does not depend on a loader change. It applies on its own and does not overlap the J775d/J873s hunks of #2279, #2277, #2278, #2291 or #1973.

Per-board values and DTB diffs

J775c, added under /soc/smc/hwmon:

fan-F0Ac { apple,key-id = "F0Ac"; label = "Fan 1"; apple,fan-minimum = "F0Mn"; apple,fan-maximum = "F0Mx"; apple,fan-target = "F0Tg"; apple,fan-mode = "F0md"; };
fan-F1Ac { apple,key-id = "F1Ac"; label = "Fan 2"; apple,fan-minimum = "F1Mn"; apple,fan-maximum = "F1Mx"; apple,fan-target = "F1Tg"; apple,fan-mode = "F1md"; };
power-PD0R { apple,key-id = "PD0R"; label = "DC Input Power"; };

J873s, added under /soc/smc/hwmon:

fan-F0Ac { apple,key-id = "F0Ac"; label = "Fan"; apple,fan-minimum = "F0Mn"; apple,fan-maximum = "F0Mx"; apple,fan-target = "F0Tg"; apple,fan-mode = "F0md"; };
power-PSTR "Total System Power", power-PDTR "AC Input Power", power-PMVR "3.8 V Rail Power",
voltage-VD0R "AC Input Voltage", current-ID0R "AC Input Current"

J775d: IDENTICAL-DTB (the hwmon nodes moved from t6050-j775d.dts into t6050-j775-hwmon.dtsi unchanged).

The fan counts come from the hardware (Mac Studio: two fans, Mac mini: one fan) and match the sibling boards on earlier SoCs. Studios J375c/d, J475c/d, J575c/d use hwmon-fan-dual. Minis J274, J473, J474s, J773g, J773s use hwmon-mini.

Assisted-by: LLM (Claude:Opus 5.5)

The Mac Studio (M5 Max, J775c) and the Mac mini (M5 Pro, J873s) have
the SMC hwmon node from t6050-die0.dtsi but no fan or power keys, so
neither shows a fan speed.

Move the J775d's SMC keys (DC input power PD0R, the two fans with the
T6050 mode keys F0md/F1md) into a new t6050-j775-hwmon.dtsi and include
it from both Studios. The J775d DTB is byte-identical. The J775c board
support by Satya Benson and Diljit Singh uses the same keys.

The J873s takes the Mac mini pattern (hwmon-common.dtsi, hwmon-mini.dtsi:
one fan), drops the shared temperature nodes so that key discovery still
runs, as J714s and J716s do, and uses the T6050 fan mode key F0md.

No new SMC keys: all of them are in the shared hwmon files or already
used on other T6050 boards. The other nine T6050 DTBs are unchanged.

Suggested-by: Jeff Queisser <funkzy@users.noreply.github.com>
Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant