Repository navigation
arm64: dts: apple: t6041: Chapel PMIC, PMU RTC and 24 cache planes on the J616C - #994
Merged
RyanTheTide merged 3 commits intoNov 6, 2026
Conversation
t6030.dtsi and t6031-die0.dtsi already use apple,chapel-pmic, and the M4 Max's main PMIC is a Chapel too. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
The tree inherits the J616s's Abbey at 0xe on nub-spmi0, which doesn't exist here: the J616C ADT has a Chapel at 0xb (spmi-chapelL1-b), so the SMC RTC offset, boot stage and shutdown cells point at nothing. The cells and the RTC alarm registers are at the Abbey offsets (ADT info-rtc_alarm_*). Describe the Chapel with those cells and its RTC, and keep nub-spmi0's interrupt controller, which the RTC's alarm uses. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
T6041 has up to eight AMCCs with four cache planes each, six on the binned part (ADT amcc-enable-mask 0x3f). List the 24 planes every T6041 has, which the MCC driver takes since the plane limit went to 32, and enable it on the J616C, where it was left disabled. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
AxxzyWasTaken
added a commit
to AxxzyWasTaken/linux
that referenced
this pull request
Nov 5, 2026
The J616C device tree is now in integration/aurora, without the J616s board file that carried the ISP setup, so take its files and add the ISP here: the alias, the firmware placeholders the loader fills, the node and its DARTs. The Chapel binding moved to aurora-silicon#994. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
Contributor
|
Merge train (MTR, 06/11): merging. I reviewed it. Everything is in Gates: test merge 2d3579ef = integration/aurora 11eccbe + #1005 #994 #930 #658 #992 #1006 #1007 #1008 #531 (#992 has since landed on its own); base 11eccbe.
Hardware (7.3.0-aurora-mtr1106a, one-shot boots, fleet recipe):
|
This was referenced Nov 6, 2026
AxxzyWasTaken
added a commit
to AxxzyWasTaken/aurora-installer
that referenced
this pull request
Nov 9, 2026
main admits the J616C without a Stage 1 caution, because Aurora has run on one. It has, but only with separately built kernel and aura: this installer has not installed it, and the J616C device tree it delivers (aurora-silicon/linux#994) has not been booted on one yet. Give the J616C its own caution, in Stage1Caution.swift and mirrored in supported-models.json, so the owner acknowledges the risk and the recovery steps before installing. The tests move j616c from the boards without a caution to the cautioned ones. Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
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.
Replaces #914, reworked as deltas on the J616C device tree that landed through astaff's series, as asked in review. Only what that tree doesn't have is left, three commits:
spmi-chapelL1-b), so the SMC RTC offset, boot stage, panic count and shutdown cells point at nothing. They're at the Abbey offsets on the Chapel, as are the RTC alarm registers (ADTinfo-rtc_alarm_*). This adds the Chapel with its cells and its PMU RTC, addsapple,chapel-pmicto the spmi-nvmem binding (t6030 and t6031 already use it), and keeps nub-spmi0's interrupt controller, which the RTC alarm needs.amcc-enable-mask0x3f), using the limit from soc: apple: mcc: allow up to 32 cache planes #911, and enables it on the J616C.Dropped from #914, already merged or not needed: the six-core P clusters, power domains, sensors, board firmware names, MTP resets, and the
aopandmtpaliases are in the merged tree. The spmi1 and spmi2 PMICs aren't needed: the merged tree deletes those buses and nothing there has a binding. The USB3 per-unit tunables are left out too: they're per-machine calibration values and the merged tree's differ from this Mac's, so a device tree can't hold one right set. They're worth a separate look, probably with the boot loader filling them in.The RTC child of the Chapel needs #930 to be populated.
Testing (J616C, 14-core M4 Max): the PMIC, RTC and 24-plane values have run daily on this Mac on 7.3 since 4 Nov, from our own tree in the old layout:
system level cache allocation enabled on 24 planes, SMC RTC, reboot and poweroff, and a 45 s timed wake from sleep on the PMU RTC (rtc1, with #930). This exact rebased tree hasn't been booted. It compiles, its only differences fromintegration/aurorain the built tree are the MCC, nub-spmi0 and PMIC nodes above, and dtc gives the same warnings as before, no new ones.dt_binding_checkwasn't run.