Skip to content

arm64: dts: apple: t6040-j614s/j616s: enable USB4 from the shared file - #2289

Closed
RyanTheTide wants to merge 1 commit into
integration/aurorafrom
m4fam/t6040-usb4-shared
Closed

RyanTheTide wants to merge 1 commit into
integration/aurorafrom
m4fam/t6040-usb4-shared

Conversation

@RyanTheTide

Copy link
Copy Markdown
Contributor

Problem

The J614s and J616s device trees each carried the same 108 lines that enable the three USB4 routers (ACIO0-2), their NHIs, DARTs and mailboxes, the ATC0-2 CIO/PCIe power states and the CIO reset controller. The Type-C to router links for both boards already lived in one shared file, t604x-j614-j616-usb4.dtsi, so a change to USB4 on these laptops had to be made in three places.

Change

The enables move from t6040-j614s.dts and t6040-j616s.dts into t604x-j614-j616-usb4.dtsi, next to the links they go with. Both ADTs have the same acio0-2, dart-acio0-2 and acio-cpu0-2 (and the same DART vm-base), so nothing in the moved block is board specific. The file's comment now says what the two board comments said.

No functional change.

Testing

  • cpp + dtc for every T6040 board (j614s, j616s, j616s-tether, j773s) before and after: all four DTBs are byte-identical to integration/aurora 0abc2f3 (sha256 prefixes e19033749616 / 2afc2d85c6f4 / e0eb3f94f4a4 / 3d5fec16256d), and dtc prints the same warnings.

Still to run

Nothing is required, since the DTBs are the same bytes. If someone wants a sanity boot on a J616s: thunderbolt domains 0-2 present, an M2 thunderbolt-net link at 20 Gb/s x 2, and a dock that enumerates and hotplugs on each port, the same as before.

Related PRs

Assisted-by: LLM (Claude:Opus 5.5)

The J614s and J616s each carried the same 108 lines enabling the three
USB4 routers, their NHIs, DARTs, mailboxes, ATC CIO power states and the
CIO reset controller, while the Type-C to router links of both already
lived in t604x-j614-j616-usb4.dtsi. Both ADTs have the same acio0-2,
dart-acio0-2 and acio-cpu0-2, so move the enables into that shared file,
next to the links they go with.

No functional change: the J614s, J616s and J616s-tether DTBs are
byte-identical before and after (and the J773s, which does not include
the file).

Signed-off-by: Ryan Murray <ryan@aurorasilicon.org>
@RyanTheTide

Copy link
Copy Markdown
Contributor Author

Closing as a duplicate of #2284, which does the same move (router enables shared by every M4 Pro, J773s typec to ACIO links) and also gives the T6040 ATC PHYs mode-switch. The J773s needs that for USB4: the PHY only enters CIO mode from its Type-C mux. Review continues on #2284.

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