Repository navigation
arm64: dts: apple: t6050: share the MagSafe 3 PD controller, add it to J714c and J716s - #2400
RyanTheTide wants to merge 1 commit into
Conversation
…o J714c and J716s The MagSafe 3 port's PD controller is an SN201202x at SPMI address 0x8 on nub-spmi-a0. Each 14" and 16" M5 Pro/Max MacBook Pro's ADT has the same node (port-type 0x11, power in only, no liquid detection). J714s, J716c and K114c describe it in their own files; J714c and J716s do not. Move the node to a new t6050-magsafe.dtsi and include it from J714s, J716c, K114c, J714c and J716s. The include sits after each board's hpm1 node, so hpm5 stays the last child of nub-spmi-a0. J716c keeps its delta: the node is disabled in t6050-j716c-sleep.dtsi until the sleep devices enable it. The J714s, J716c and K114c DTBs are byte-identical. J714c and J716s gain the usb-pd@8 node. J775c, J775d and J873s have no MagSafe and are unchanged. K116s is described by its sleep series. K114s and K116c do not yet describe nub-spmi-a0 and are left for the USB-C series. The node was first written for the J714s by DjDeveloperr, and for the K114c by Joshua Warren; J716c's by Erik Bourget. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
No blockers. I built all 11 T6050 DTBs from this PR merged onto the current integration/aurora (398 commits ahead of the PR's base). J714s, J716c, K114c, J775c, J775d, J873s, K114s, K116c and K116s are byte-identical to the base. J714c and J716s gain only usb-pd@8 under spmi@28a188000. The later &hpm5 overrides on the base (t6050-j714s.dts apple,sleep-ssps-rules and apple,reset-on-failed-probe, t6050-j714s-sleep.dtsi, t6050-j716c-sleep-devices.dtsi) all come after the new include, so the labels resolve and the J714s/J716c result is unchanged. J714c and J716s carry no sleep properties on hpm0/hpm1/hpm2 either, so hpm5 behaves like their USB-C controllers. dt-checks and host-tests pass.
HW row (owners' Macs, not blocking a DT-only move): J714c or J716s on this head: MagSafe plug gives a new typec port and its tps6598x-source-psy online=1, and unplug gives online=0, with no tipd errors for usb-pd@8. Plus 0 AVC, 0 failed units and 0 new kernel errors. Assisted-by: LLM (Claude:Opus 5.5) |
Problem
The MagSafe 3 port's PD controller (an SN201202x at SPMI address 0x8 on nub-spmi-a0) is not described on J714c and J716s. J714s, J716c and K114c each describe it in their own file, as three copies of the same node.
Change
t6050-magsafe.dtsiwith thehpm5: usb-pd@8node (compatible, reg,apple,no-liquid-detection). No connector node: the port has no USB data path. tipd registers a Type-C port and a power supply for it, as on J714s.&hpm5 { status = "disabled"; }int6050-j716c-sleep.dtsi.t6050-j716c-sleep-devices.dtsistill enables it and addsapple,sleep-ssps.t6050-k114-k116-usb.dtsican include this file for all four K boards.The node was first written by DjDeveloperr (J714s), Joshua Warren (K114c) and Erik Bourget (J716c).
Testing
usb-pd@8underspmi@28a188000and nothing else.port0reg-name that this change does not touch. J716s has 0.t6050-k114c.dts. To resolve it, keep arm64: dts: apple: t6050: share the K boards' N1 and USB-C ports, add K114s and K116c #2280's side, drop the hpm5 node from its&nub_spmi_a0block, and keep the include.Still to run
/sys/class/typec/portNappears, its power supply showsonline= 1, and dmesg has no tipd errors forusb-pd@8. Unplug it andonlinegoes to 0.online.Per-board values and DTB diffs
hpm5 in each board's ADT: nub-spmi-a0, SID 0x8, port-type 0x11, features-supported 3. This is the same on J714c, J714s, J716c, J716s, K114c, K114s, K116c and K116s. J775c and J873s have no such node.
J714c and J716s DTB diff (decompiled, sorted), the same on both:
nub-spmi-a0 children after: J714c
usb-pd@8 usb-pd@a, J716susb-pd@a usb-pd@8. J714s, J716c and K114c are unchanged.Assisted-by: LLM (Claude:Opus 5.5)