Repository navigation
arm64: dts: apple: t6050-k114-k116: SMC fans and sensors on all four boards - #2281
RyanTheTide wants to merge 1 commit into
Conversation
…boards The K114c, K114s and K116c leave the SMC hwmon node disabled; only the K116s turns it on, with the dual-fan, power, voltage and current keys and temperature discovery. Move the K116s block into t6050-k114-k116.dtsi so all four boards get it. The four boards' ADTs carry the same SMC node, and all four are dual-fan MacBook Pros like the J714s and J716s. The key set is the one the K116s, J714s and J716s already use; a key a board's SMC lacks only drops its channel. The K116s DTB is byte-identical. K114c, K114s and K116c gain the hwmon channels. No other T6050 board changes. The K116s block was written by Jens Axboe. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
No blockers. On current integration/aurora, K114c, K114s and K116c change only in HW row: K114c, K114s and K116c (owners) on the head: Assisted-by: LLM (Claude:Opus 5.5) |
Problem
The SMC hwmon node is disabled on K114c, K114s and K116c (
t6050-k114-k116.dtsi). Only K116s turns it on, in its own board file. So the other three PROLED MacBook Pros show no fan speeds and no SMC power, voltage or temperature channels.J714c is handled in #1984 and J716c in #2208/#2209. This PR does not touch them.
Change
t6050-k114-k116.dtsi: the K116s hwmon block moves here, unchanged:hwmon-common.dtsi,hwmon-fan-dual.dtsiandhwmon-laptop.dtsi, the shared temperature nodes andapple,soc-die-keysdropped so temperature discovery runs, and fan mode keysF0md/F1md. There is noapple,fan-manual-control, so the SMC keeps driving the fans.t6050-k116s.dts: the block is removed from here.No per-board deltas. The SMC node in the four boards' ADTs is the same. The ADT has no fan count or SMC key list. All four boards are dual-fan MacBook Pros like J714s and J716s, which use the same two-fan key set.
drivers/hwmon/macsmc-hwmon.chas no board gate. It checks only the SoC compatible, for its debugfs files.Testing
make dtbs CHECK_DTBS=y(dtschema) for every T6050 DTB on this branch: builds clean, no dtc warnings, and no schema message that integration/aurora does not already have.Still to run
The keys were read on the K116s. On K114c, K114s and K116c the same keys are assumed: F0Ac/F1Ac with F0Mn/F0Mx/F0Tg/F0md and F1Mn/F1Mx/F1Tg/F1md, plus PSTR, PDTR, PMVR, PHPC, ID0R, VD0R and SBAV. If a key is missing, its channel is dropped and the driver logs it.
sensorsshows two fan RPMs and the temperatures.dmesg | grep -i macsmcshows no key errors.No loader change is needed.
Per-board values and DTB diffs
Values: no new values. The key set is the K116s one, already used by J714s and J716s. The SMC node was compared across the K114cAP, K114sAP, K116cAP and K116sAP ADTs and is the same apart from phandles.
K114c, K114s and K116c each get this same change in the decompiled DTB (
/soc/smc/hwmon):K116s: byte-identical DTB.
Assisted-by: LLM (Claude:Opus 5.5)