Repository navigation
arm64: dts: apple: t6040: Thunderbolt/USB4 on the Mac mini M4 Pro, router enables shared by every M4 Pro - #2284
RyanTheTide wants to merge 4 commits into
Conversation
…routers The links from each Type-C connector to the USB4 router behind the same ATC PHY lived in a file only the M4 Pro MacBook Pros included. The Mac mini (J773s) has the same wiring: its ADT pairs acio0-2 with atc-phy0-2 and with the port controllers hpm0-2 (back middle, back left, back right), which the board already names typec0-2, and the router, DART and lstx GPIO addresses match the laptops'. Rename t604x-j614-j616-usb4.dtsi to t6040-usb4-typec.dtsi and include it from the J773s as well. The routers stay disabled, and a port controller skips a link to a disabled router, so nothing changes at runtime yet. The J614s, J616s and J616s-tether DTBs are byte-identical. Signed-off-by: Ryan <ryan@aurorasilicon.org>
… every board The port controller finds the PHY it switches between USB3, DP alt mode and USB4/Thunderbolt by the PHY's mode-switch property. Only the M4 Pro MacBook Pros set it, from their external display file, so on the Mac mini (J773s) the port controllers never get a mux and a USB4 link could not come up even with the routers enabled. Move the three mode-switch properties into t6040-usb4-typec.dtsi next to the connector links, which every T6040 board includes. The J614s, J616s and J616s-tether DTBs are byte-identical; the J773s gains mode-switch on atcphy0-2. Signed-off-by: Ryan <ryan@aurorasilicon.org>
The J614s and J616s each carried an identical block enabling ACIO0-2, their DARTs, NHIs, mailboxes, the CIO reconfiguration block and the ATC power domains, while the Mac mini (J773s), which has the same three routers behind its three back Thunderbolt ports, had none of it. Its ADT has the same acio0-2, dart-acio0-2 (same vm-base) and acio-cpu0-2 at the same addresses, with the same lstx GPIOs. Enable them once in the SoC files instead: the router, DART, NHI and CIO reconfiguration nodes in t6040-usb4.dtsi with the router DART DMA window, the mailboxes in t6040.dtsi, and the power domains at the end of t6040-usb4.dtsi. PCIe tunnels stay off as before: rather than every board deleting apple,pcie-tunnel, the routers no longer carry it. The J614s, J616s and J616s-tether DTBs are unchanged apart from phandle numbering and property order. The J773s gains the three routers. Signed-off-by: Ryan <ryan@aurorasilicon.org>
|
I checked this independently against the head (bff7312), building with cpp + dtc from a separate tree:
This also builds cleanly together with the J773s front USB-C change (ATC3 fixed hub), which only touches |
t6040-j614s.dts, t6040-j616s.dts: kept this branch's removal of the per-board router blocks; integration's router DART power-domains (ps_atcN_cio) carried into the shared usb4_N_dart nodes in t6040-usb4.dtsi. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Merged integration/aurora (f5f023b); conflicts in t6040-j614s.dts and t6040-j616s.dts resolved (per-board router blocks stay removed; integration's ps_atcN_cio power-domains on the router DARTs carried into t6040-usb4.dtsi), all seven T604x board DTBs build with unchanged dtc warnings; J614s, J616s and J616s-tether decompile identical to integration (sorted), T6041 boards unchanged, DART power-domain check: no new findings. |
Brings in the updated #2284 branch, which merged integration/aurora. No conflicts: the router DART power-domains followed t6040-usb4.dtsi into t604x-usb4.dtsi. Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
|
Rebased and dt-checks is green; J614s/J616s decompile identical. Still needed: a J773s row on this head with a USB4/Thunderbolt device on each of the three back ports (link up, replug, flip) before it leaves draft. |
Problem. The Mac mini M4 Pro (J773s) has three Thunderbolt 5 ports on the back, but its USB4 routers were disabled and nothing linked its Type-C ports to them. Its ATC PHYs also had no
mode-switch, so the port controller never switches them into USB4 mode. The J614s and J616s each carried their own copy of the same router enables, and the laptops gotmode-switchonly from a display include.Change. Three commits:
t604x-j614-j616-usb4.dtsibecomest6040-usb4-typec.dtsi, and the J773s includes it as well. Per the ADT the wiring matches the laptops: acioN sits behind atc-phyN, and port controller hpmN points at acioN.mode-switchin the shared file, for every board.t6040-usb4.dtsi/t6040.dtsi, and drop the per-board copies. PCIe tunnels stay off as before: the router nodes no longer carryapple,pcie-tunnel, so no board has to delete it.aura needs no change. Its router/DROM and ATC tunable handoff loops over
/arm-io/acioNfor any board.Testing. cpp + dtc on every T604x board: same warning counts. Decompiled with phandles normalized:
port@2links,mode-switchon atcphy0-2, and the enabled router blocks with their power domains.Still to run (J773s, each back port).
Conflicts with #2069, which edits the old per-board blocks; whichever lands second needs a small rebase.
Assisted-by: LLM (Claude:Opus 5.5)