Skip to content

arm64: dts: apple: t6041-j616c: enable the ISP - #931

Closed
AxxzyWasTaken wants to merge 9 commits into
aurora-silicon:integration/aurorafrom
AxxzyWasTaken:j616c-dt-camera
Closed

arm64: dts: apple: t6041-j616c: enable the ISP#931
AxxzyWasTaken wants to merge 9 commits into
aurora-silicon:integration/aurorafrom
AxxzyWasTaken:j616c-dt-camera

Conversation

@AxxzyWasTaken

@AxxzyWasTaken AxxzyWasTaken commented Nov 4, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

Enables the ISP on the J616C. The J616C device tree in integration/aurora doesn't include t604x-j614-j616.dtsi, which holds the ISP setup for the other boards, so this adds it to t6041-j616c.dts:

  • the isp alias
  • isp-firmware-text, isp-firmware-data and isp-heap under /reserved-memory
  • &isp with the memory regions, platform ID, camera connection scheme and the two IMX958 presets
  • &isp_dart0, &isp_dart1 and &isp_dart2

iBoot places the ISP firmware differently on each boot here. The two firmware regions are placeholders with the J616s addresses, and the loader fills them from the ADT.

Needs aura#71, now merged. Without it the regions keep the J616s addresses, and the driver fails its firmware boot and gives up.

Testing

  • t6041-j616c.dtb builds on integration/aurora 11eccbe with no ISP warnings at W=1.
  • The merged tree has not been booted yet.
  • The 720p preset now uses the crop from arm64: dts: apple: t604x-j614-j616: scale the 720p camera preset #1005. The same crop runs on my Mac, from a separate tree.
  • An earlier version of this change, on the previous DT stack, booted on a 32-core J616C with aura#71 on a 7.3 kernel. The camera came up as FaceTime HD Camera at 1920x1080, and a 6-second capture gave a live image, checked by its brightness only.

@AxxzyWasTaken
dt-bindings: nvmem: apple,spmi-nvmem: Add apple,chapel-pmic
71e6a18 
The Chapel PMIC is on the T6030 and T6031 (M3 Pro/Max) SPMI buses, whose
trees already use this compatible, and on the T6041 (M4 Max).

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@AxxzyWasTaken
arm64: dts: apple: Add the T6041 (M4 Max) SoC
c54dcf8 
T6041 has the blocks t6040.dtsi describes at the same addresses and
interrupts (checked against a J616C ADT). Three things differ:

 - Two clusters of six P cores instead of five. The boot loader matches
   the DT's CPU nodes to the ADT's by MPIDR and drops the ones a binned
   part leaves out (the 14-core J616C has exactly the J616s's cores), so
   t6040.dtsi adds the sixth core of each cluster when t6041.dtsi asks
   for them.
 - The main PMIC is a Chapel at SPMI address 0xb (ADT nub-spmi0
   spmi-chapelL1-b), not an Abbey at 0xe. Its nvmem cells and RTC alarm
   registers (ADT info-rtc_alarm_*) sit at the Abbey offsets.
 - Up to eight AMCCs with four cache planes each, six on the binned
   part (ADT amcc-enable-mask 0x3f): the MCC lists the 24 planes every
   T6041 has, which needs the mcc driver to take more than 16.

t6040.dtb files do not change.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@AxxzyWasTaken
arm64: dts: apple: Add the MacBook Pro 16-inch M4 Max (J616C)
a52c873 
J616C is the J616s chassis with the T6041. Checked against a J616C ADT
(macOS 26.6.2, iBoot mBoot-18000.161.10): every power domain of
t6040-pmgr.dtsi, the display block, AVD, PMP, AOP, MTP, SMC, NVMe and
USB sit at the same addresses, with the same interrupts and DART
streams.

What differs from J616s:
 - the trackpad firmware is tpmtfw-j616c.bin, and the factory data
   mesacal-j616c.bin and msrk-j616c.bin;
 - nub-spmi1 holds a Chapel at 0xb and a Spitfire at 0x9, nub-spmi2
   Portiers at 0xa and 0xb, not Abbeys at 0xe; nothing on nub-spmi2
   has a binding yet, so that bus is left out;
 - five per-unit USB3 PHY values (auspll, cio4pll, aus40cmn-shm), from
   this machine's ADT; every other tunable matches J616s;
 - iBoot moves the ISP firmware from boot to boot, so the ISP stays off
   until the boot loader fills in its placement;
 - the GPU (ADT gpu,t6041) is not described yet and stays off.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@AxxzyWasTaken
arm64: dts: apple: t6041-j616c: Fix the MTP and AOP bring-up
1ca2e4e 
Booting the J616C on 7.3 left the keyboard, trackpad and audio dead: RTKit
timed out on the MTP and AOP, and dockchannel-hid failed its AFE preflight.

- aura only programs a co-processor's DAPF if the device tree has its alias.
  The shared J614s/J616s file has only pmp, so add aop and mtp.
- The J616C has no gp1c key. Its AFE and STM resets are lines 25 and 26 of the
  SMC's low GPIO block, so describe that block, drop apple,afe-smc and use
  power method 2.
- Use the plain dockchannel-hid compatible: this Mac's MTP firmware runs
  without the J616s's ring transport on our daily tree.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@AxxzyWasTaken
arm64: dts: apple: t6041-j616c: Add the ISP alias
a53c468 
aura only opens a co-processor's DAPF if the device tree has its alias, as
with the AOP and MTP. The ISP stays disabled here for now, so this changes
nothing yet, but the camera can't start without it once the ISP is enabled.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@AxxzyWasTaken
arm64: dts: apple: t6041-j616c: enable the ISP
00cc77c 
iBoot places the ISP firmware differently on each boot, so the J616s
addresses in the shared placeholders don't hold here. The loader now fills
them from the ADT, so the node can be enabled.
@AxxzyWasTaken AxxzyWasTaken mentioned this pull request Nov 4, 2026
Merged
@RyanTheTide RyanTheTide mentioned this pull request Nov 5, 2026
Closed
@AxxzyWasTaken
Merge integration/aurora into j616c-dt-camera
d35028a 
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>
@AxxzyWasTaken AxxzyWasTaken changed the title arm64: dts: apple: t6041-j616c: enable the ISP (stacked on #914) arm64: dts: apple: t6041-j616c: enable the ISP Nov 5, 2026
@AxxzyWasTaken
arm64: dts: apple: t6041-j616c: keep the full frame in the 720p preset
d63e7ca 
The 720p preset cropped 1280x720 out of the top left of the 1920x1080
frame instead of scaling the whole frame, as aurora-silicon#1005 fixed for the other
boards.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@AxxzyWasTaken
AxxzyWasTaken marked this pull request as ready for review November 7, 2026 11:23
@AxxzyWasTaken
Merge integration/aurora into j616c-dt-camera
19125d7 
Keep the ISP nodes beside the fan nodes that integration added at the same spot.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
@DjDeveloperr DjDeveloperr mentioned this pull request Nov 7, 2026
Merged
RyanTheTide
RyanTheTide reviewed Nov 9, 2026
View reviewed changes

@RyanTheTide RyanTheTide left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

00cc77c has no Signed-off-by, and t6041-j616c.dts now conflicts with integration/aurora since the J614c/J616c board body became shared (8a947b9). Could you sign off that commit and rebase onto the shared t6041 files?

@AxxzyWasTaken AxxzyWasTaken mentioned this pull request Nov 9, 2026
Merged
@AxxzyWasTaken

AxxzyWasTaken commented Nov 9, 2026

Copy link
Copy Markdown
Contributor Author

Rebased onto the shared t6041 files with every commit signed off, in #1368. Closing this one in favour of it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@RyanTheTide RyanTheTide RyanTheTide left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@AxxzyWasTaken @RyanTheTide