Repository navigation
arm64: dts: apple: t6040-j614s/j616s: enable USB4 from the shared file - #2289
Closed
RyanTheTide wants to merge 1 commit into
Closed
RyanTheTide wants to merge 1 commit into
RyanTheTide wants to merge 1 commit into
Conversation
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>
Contributor
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.dtsandt6040-j616s.dtsintot604x-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
integration/aurora0abc2f3 (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
/delete-property/ apple,pcie-tunnelfrom the three&usb4_N_acioblocks int6040-j614s.dts. After this PR those blocks live in the shared file. J614s: PCIe-C on the Thunderbolt ports (Studio Display USB, audio, camera) #2069 can either re-addapple,pcie-tunnel = <&usb4_N_pcie_tunnel>;in itst6040-j614s-pciec.dtsi, or, once the J616s gets PCIe-C as well, drop the delete from the shared file.t6040-usb4-typec.dtsiand includes it from the J773s.Assisted-by: LLM (Claude:Opus 5.5)