From b38fc1559aea784394fd034dea417642c61cfaf2 Mon Sep 17 00:00:00 2001
From: AxxzyWasTaken <axxzytte@gmail.com>
Date: Mon, 9 Nov 2026 17:33:17 +0000
Subject: [PATCH] arm64: dts: apple: t6041-j616c: enable the ISP

iBoot places the ISP firmware differently on each boot here, so the J616s
placement does not hold. The loader fills the firmware regions from the
ADT, so add them as placeholders with the J616s addresses and enable the
ISP: its alias, which aura needs to open the DAPF, the firmware regions
and heap, the node with its platform ID, camera connection scheme and two
IMX958 presets (the 720p one keeps the full frame, as #1005 did for the
other boards), and the three DARTs.

This goes in the J616c board file, not in t6041-j614c-j616c.dtsi: there
is no J614c ADT yet, so its camera setup is unchecked.

Signed-off-by: AxxzyWasTaken <axxzytte@gmail.com>
---
 arch/arm64/boot/dts/apple/t6041-j616c.dts | 68 +++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t6041-j616c.dts b/arch/arm64/boot/dts/apple/t6041-j616c.dts
index 9e122229805c5..f6a2ad6e49e21 100644
--- a/arch/arm64/boot/dts/apple/t6041-j616c.dts
+++ b/arch/arm64/boot/dts/apple/t6041-j616c.dts
@@ -16,6 +16,35 @@
 / {
 	compatible = "apple,j616c", "apple,t6041", "apple,arm-platform";
 	model = "Apple MacBook Pro (16-inch, M4 Max)";
+
+	/* aura opens a co-processor's DAPF only if it finds its alias. */
+	aliases {
+		isp = &isp;
+	};
+
+	reserved-memory {
+		/*
+		 * iBoot moves the ISP firmware each boot: the loader fills
+		 * these placeholders from the ADT. It runs at 0x100_0000_0000
+		 * onwards, in its 32 MiB main memory.
+		 */
+		isp_fw_text: isp-firmware-text@10000c44000 {
+			reg = <0x100 0x00c44000 0x0 0xca8000>;
+			iommu-addresses = <&isp 0x100 0x0 0x0 0xca8000>;
+			no-map;
+		};
+
+		isp_fw_data: isp-firmware-data@10001e7c000 {
+			reg = <0x100 0x01e7c000 0x0 0x1344000>;
+			iommu-addresses = <&isp 0x100 0xca8000 0x0 0x1344000>;
+			no-map;
+		};
+
+		/* the firmware's main memory, the driver allocates above it */
+		isp_heap: isp-heap {
+			iommu-addresses = <&isp 0x100 0x0 0x0 0x2000000>;
+		};
+	};
 };
 
 &mtp_hid {
@@ -56,3 +85,42 @@
 &mesa {
 	firmware-name = "apple/mesacal-j616c.bin", "apple/msrk-j616c.bin";
 };
+
+&isp {
+	memory-region = <&isp_fw_text>, <&isp_fw_data>, <&isp_heap>;
+	memory-region-names = "text", "data", "heap";
+	apple,platform-id = <5>;
+	/* ADT isp0 cam-connections-scheme */
+	apple,cam-connections-scheme = <0x10>;
+	status = "okay";
+
+	/* The front camera, an IMX958: firmware configuration 5. */
+	sensor-presets {
+		/* 1920x1080 */
+		preset0 {
+			apple,config-index = <5>;
+			apple,input-size = <1920 2160>;
+			apple,output-size = <1920 1080>;
+			apple,crop = <0 0 1920 1080>;
+		};
+		/* 1280x720 */
+		preset1 {
+			apple,config-index = <5>;
+			apple,input-size = <1920 2160>;
+			apple,output-size = <1280 720>;
+			apple,crop = <0 0 1920 1080>;
+		};
+	};
+};
+
+&isp_dart0 {
+	status = "okay";
+};
+
+&isp_dart1 {
+	status = "okay";
+};
+
+&isp_dart2 {
+	status = "okay";
+};