From 83c82bc7b1af6565edd8b7c5c5c266752cc0f1a8 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:26:06 +0700
Subject: [PATCH 01/21] arm64: dts: apple: t8142-j813: Build on t8142.dtsi

J704 and J815 describe their boards on top of the T8142 inventory in
t8142.dtsi, but J813 still defines its own root, CPUs, timer, AIC and
UARTs, and its fragments define the pmgr and DART nodes that the
inventory also has. A board that includes t8142.dtsi therefore cannot
use the J813 fragments: the labels are defined twice. That blocks the
J815, which shares most of them.

Include t8142.dtsi in J813 and enable what it uses, as J815 does. Turn
the fragments' pmgr, AOP, AVD, DCP, display, PCIe, PMP and MTP DART
definitions into references that keep J813's values. Enable the two USB
DARTs, which the inventory disables at the same paths.

The flattened J813 tree is unchanged apart from explicit
status = "okay", interrupt-parent now inherited from the root, and the
inventory's extra USB DART labels: compared with dtc -I dts -O dts -s
before and after, with phandle numbers removed.

Not tested on J813 hardware.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 .../boot/dts/apple/t8142-j813-audio.dtsi      |  11 +-
 arch/arm64/boot/dts/apple/t8142-j813-avd.dtsi |  12 +-
 .../boot/dts/apple/t8142-j813-display.dtsi    |  27 +--
 arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi  |  10 +-
 .../dts/apple/t8142-j813-peripherals.dtsi     | 130 +++++------
 arch/arm64/boot/dts/apple/t8142-j813-usb.dtsi |   2 +
 arch/arm64/boot/dts/apple/t8142-j813.dts      | 219 +++++-------------
 7 files changed, 145 insertions(+), 266 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t8142-j813-audio.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-audio.dtsi
index 892155da27ee0..c345bc3ff50ac 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813-audio.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142-j813-audio.dtsi
@@ -210,13 +210,6 @@
 	 * (setup port) and 11 (admac-leap-s) on the raw boot. As on T8140, the
 	 * firmware's own mappings own the first slot, host buffers go above it.
 	 */
-	aop_dart: iommu@390fc0000 {
-		compatible = "apple,t8142-dart", "apple,t8110-dart";
-		reg = <0x3 0x90fc0000 0x0 0xc000>;
-		#iommu-cells = <1>;
-		interrupt-parent = <&aic>;
-		interrupts = <AIC_IRQ 528 IRQ_TYPE_LEVEL_HIGH>;
-	};
 
 	admac_base_ns: dma-controller@393800000 {
 		compatible = "apple,t8140-admac";
@@ -415,3 +408,7 @@
 		};
 	};
 };
+
+&aop_dart {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/apple/t8142-j813-avd.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-avd.dtsi
index 5672ebb885a51..3dd7ff576fea4 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813-avd.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142-j813-avd.dtsi
@@ -33,13 +33,9 @@
 		reg-names = "code", "sram", "mbox", "ctrl";
 		iommus = <&avd_dart 0>, <&avd_dart 1>, <&avd_dart 2>;
 	};
+};
 
-	avd_dart: iommu@501020000 {
-		compatible = "apple,t8142-dart", "apple,t8110-dart";
-		reg = <0x5 0x01020000 0x0 0x20000>;
-		#iommu-cells = <1>;
-		interrupt-parent = <&aic>;
-		interrupts = <AIC_IRQ 1084 IRQ_TYPE_LEVEL_HIGH>;
-		power-domains = <&ps_avd_sys>;
-	};
+&avd_dart {
+	power-domains = <&ps_avd_sys>;
+	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/apple/t8142-j813-display.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-display.dtsi
index d9e890af7fd44..530e98ff62eb7 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813-display.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142-j813-display.dtsi
@@ -44,23 +44,6 @@
 		#mbox-cells = <0>;
 	};
 
-	disp0_dart: iommu@286300000 {
-		compatible = "apple,t8142-dart", "apple,t8110-dart";
-		reg = <2 0x86300000 0 0xc000>;
-		interrupts = <AIC_IRQ 800 IRQ_TYPE_LEVEL_HIGH>;
-		#iommu-cells = <1>;
-		apple,dma-range = <0x100 0x0 0x10 0x0>;
-		status = "disabled";
-	};
-
-	dcp_dart: iommu@286340000 {
-		compatible = "apple,t8142-dart", "apple,t8110-dart";
-		reg = <2 0x86340000 0 0x20000>;
-		interrupts = <AIC_IRQ 800 IRQ_TYPE_LEVEL_HIGH>;
-		#iommu-cells = <1>;
-		apple,dma-range = <0x100 0x0 0x10 0x0>;
-	};
-
 	dcp: dcp@286e00000 {
 		compatible = "apple,t8142-dcp", "apple,dcp";
 		mboxes = <&dcp_mbox>;
@@ -106,3 +89,13 @@
 		};
 	};
 };
+
+&disp0_dart {
+	reg = <2 0x86300000 0 0xc000>;
+	apple,dma-range = <0x100 0x0 0x10 0x0>;
+};
+
+&dcp_dart {
+	apple,dma-range = <0x100 0x0 0x10 0x0>;
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi
index 052491f27233b..e99e7876e7c66 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142-j813-n1.dtsi
@@ -36,12 +36,8 @@
 		msi-controller;
 		msi-ranges = <&aic AIC_IRQ 1741 IRQ_TYPE_EDGE_RISING 32>;
 	};
+};
 
-	pcie0_dart: iommu@488000000 {
-		compatible = "apple,t8142-dart", "apple,t8110-dart";
-		reg = <4 0x88000000 0 0x20000>;
-		interrupt-parent = <&aic>;
-		interrupts = <AIC_IRQ 1463 IRQ_TYPE_LEVEL_HIGH>;
-		#iommu-cells = <1>;
-	};
+&pcie0_dart {
+	status = "okay";
 };
diff --git a/arch/arm64/boot/dts/apple/t8142-j813-peripherals.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-peripherals.dtsi
index 32415bdaa874b..5a56c48da474f 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813-peripherals.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142-j813-peripherals.dtsi
@@ -28,76 +28,65 @@
 	};
 };
 
-&{/soc} {
-	pmgr: power-management@380700000 {
-		compatible = "apple,t8142-pmgr", "apple,t8103-pmgr", "syscon", "simple-mfd";
-		/* As on T8140: up to the ISP17a slots at +0x4000..+0x4060. */
-		reg = <3 0x80700000 0 0x14000>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		ps_fpwm0: power-controller@330 {
-			compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
-			reg = <0x330 4>;
-			#power-domain-cells = <0>;
-			#reset-cells = <0>;
-			label = "fpwm0";
-		};
+&pmgr {
+	/* As on T8140: up to the ISP17a slots at +0x4000..+0x4060. */
+	reg = <3 0x80700000 0 0x14000>;
+	status = "okay";
+
+	ps_fpwm0: power-controller@330 {
+		compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
+		reg = <0x330 4>;
+		#power-domain-cells = <0>;
+		#reset-cells = <0>;
+		label = "fpwm0";
+	};
 
-		/* ADT pmgr devices: SPI_P id 94 (+0x390), QSPI id 120 (+0x460). */
-		ps_spi_p: power-controller@390 {
-			compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
-			reg = <0x390 4>;
-			#power-domain-cells = <0>;
-			#reset-cells = <0>;
-			label = "spi_p";
-		};
+	/* ADT pmgr devices: SPI_P id 94 (+0x390), QSPI id 120 (+0x460). */
+	ps_spi_p: power-controller@390 {
+		compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
+		reg = <0x390 4>;
+		#power-domain-cells = <0>;
+		#reset-cells = <0>;
+		label = "spi_p";
+	};
 
-		/* ADT pmgr devices: PMP id 159 (+0x598), PMS_SRAM id 160 (+0x5a0). */
-		ps_pmp: power-controller@598 {
-			compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
-			reg = <0x598 4>;
-			#power-domain-cells = <0>;
-			#reset-cells = <0>;
-			label = "pmp";
-			/* The PMP's SRAM, which the driver reads first. */
-			power-domains = <&ps_pms_sram>;
-		};
+	/* ADT pmgr devices: PMP id 159 (+0x598), PMS_SRAM id 160 (+0x5a0). */
+	ps_pmp: power-controller@598 {
+		compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
+		reg = <0x598 4>;
+		#power-domain-cells = <0>;
+		#reset-cells = <0>;
+		label = "pmp";
+		/* The PMP's SRAM, which the driver reads first. */
+		power-domains = <&ps_pms_sram>;
+	};
 
-		ps_pms_sram: power-controller@5a0 {
-			compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
-			reg = <0x5a0 4>;
-			#power-domain-cells = <0>;
-			#reset-cells = <0>;
-			label = "pms_sram";
-			/* T8140 holds it through its always-on PMP report node. */
-			apple,always-on;
-		};
+	ps_pms_sram: power-controller@5a0 {
+		compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
+		reg = <0x5a0 4>;
+		#power-domain-cells = <0>;
+		#reset-cells = <0>;
+		label = "pms_sram";
+		/* T8140 holds it through its always-on PMP report node. */
+		apple,always-on;
+	};
 
-		ps_qspi: power-controller@460 {
-			compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
-			reg = <0x460 4>;
-			#power-domain-cells = <0>;
-			#reset-cells = <0>;
-			label = "qspi";
-			power-domains = <&ps_spi_p>;
-		};
+	ps_qspi: power-controller@460 {
+		compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
+		reg = <0x460 4>;
+		#power-domain-cells = <0>;
+		#reset-cells = <0>;
+		label = "qspi";
+		power-domains = <&ps_spi_p>;
 	};
+};
 
+&{/soc} {
 	/*
 	 * PMP, laid out as on T8140 (ADT /arm-io/pmp, dart-pmp): it runs the
 	 * DRAM controller (DCS) and fabric DVFS. Without it the memory stays at
 	 * the bootloader's state (memcpy ~20 GB/s against ~120 GB/s on macOS).
 	 */
-	pmp_dart: iommu@380300000 {
-		compatible = "apple,t8142-dart", "apple,t8110-dart";
-		reg = <0x3 0x80300000 0x0 0xc000>;
-		interrupt-parent = <&aic>;
-		interrupts = <AIC_IRQ 1004 IRQ_TYPE_LEVEL_HIGH>;
-		#iommu-cells = <1>;
-		apple,dma-range = /bits/ 64 <0x10000000000 0xbff00000>;
-		power-domains = <&ps_pmp>;
-	};
 
 	pmp: pmp@380500000 {
 		compatible = "apple,t8142-pmp-v2", "apple,t8140-pmp-v2";
@@ -168,14 +157,19 @@
 		clocks = <&clkref>;
 		#pwm-cells = <2>;
 	};
-
-	mtp_dart: iommu@394800000 {
-		compatible = "apple,t8142-dart", "apple,t8110-dart";
-		reg = <3 0x94800000 0 0xc000>;
-		interrupts = <AIC_IRQ 1275 IRQ_TYPE_LEVEL_HIGH>;
-		#iommu-cells = <1>;
-		/* Keep host allocations clear of firmware's low IOVA mappings. */
-		apple,dma-range = <0 0x02000000 0 0x10000000>;
-	};
 };
 #include "t8142-j813-pmp-tunables.dtsi"
+
+&pmp_dart {
+	apple,dma-range = /bits/ 64 <0x10000000000 0xbff00000>;
+	power-domains = <&ps_pmp>;
+	status = "okay";
+};
+
+&mtp_dart {
+	reg = <3 0x94800000 0 0xc000>;
+	/delete-property/ reg-names;
+	/* Keep host allocations clear of firmware's low IOVA mappings. */
+	apple,dma-range = <0 0x02000000 0 0x10000000>;
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/apple/t8142-j813-usb.dtsi b/arch/arm64/boot/dts/apple/t8142-j813-usb.dtsi
index e27e40c04e268..2eb0b1f16af47 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813-usb.dtsi
+++ b/arch/arm64/boot/dts/apple/t8142-j813-usb.dtsi
@@ -132,6 +132,7 @@
 		power-domains = <&ps_atc0_usb>;
 		#iommu-cells = <1>;
 		apple,dma-range = <0x100 0x4000 0 0xffff0000>;
+		status = "okay";
 	};
 
 	dwc3_0_dart_1: iommu@402f80000 {
@@ -278,6 +279,7 @@
 		power-domains = <&ps_atc1_usb>;
 		#iommu-cells = <1>;
 		apple,dma-range = <0x100 0x4000 0 0xffff0000>;
+		status = "okay";
 	};
 
 	dwc3_1_dart_1: iommu@40af80000 {
diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts
index 21b1688e83f8a..020cd3d6fe280 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j813.dts
@@ -8,18 +8,13 @@
  */
 /dts-v1/;
 
-#include <dt-bindings/interrupt-controller/apple-aic.h>
-#include <dt-bindings/interrupt-controller/irq.h>
+#include "t8142.dtsi"
 
 / {
 	compatible = "apple,j813", "apple,t8142", "apple,arm-platform";
 	model = "Apple MacBook Air (13-inch, M5, 2026)";
 	chassis-type = "laptop";
 
-	#address-cells = <2>;
-	#size-cells = <2>;
-	interrupt-parent = <&aic>;
-
 	aliases {
 		serial0 = &dockchannel;
 		serial1 = &serial0;
@@ -39,173 +34,81 @@
 		};
 	};
 
-	reserved-memory {
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-		/* Filled by the loader. */
-	};
-
 	memory@10000000000 {
-		device_type = "memory";
 		reg = <0x100 0 0x4 0>; /* Filled by the loader. */
 	};
+};
 
-	cpus {
-		#address-cells = <2>;
-		#size-cells = <0>;
-
-		cpu0: cpu@0 {
-			compatible = "apple,t8142-e";
-			device_type = "cpu";
-			reg = <0 0x0>;
-			operating-points-v2 = <&ecluster_opp>;
-			performance-domains = <&cpufreq_e>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
-
-		cpu1: cpu@1 {
-			compatible = "apple,t8142-e";
-			device_type = "cpu";
-			reg = <0 0x1>;
-			operating-points-v2 = <&ecluster_opp>;
-			performance-domains = <&cpufreq_e>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
-
-		cpu2: cpu@2 {
-			compatible = "apple,t8142-e";
-			device_type = "cpu";
-			reg = <0 0x2>;
-			operating-points-v2 = <&ecluster_opp>;
-			performance-domains = <&cpufreq_e>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
+&cpu0 {
+	operating-points-v2 = <&ecluster_opp>;
+	performance-domains = <&cpufreq_e>;
+	status = "okay";
+};
 
-		cpu3: cpu@3 {
-			compatible = "apple,t8142-e";
-			device_type = "cpu";
-			reg = <0 0x3>;
-			operating-points-v2 = <&ecluster_opp>;
-			performance-domains = <&cpufreq_e>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
+&cpu1 {
+	operating-points-v2 = <&ecluster_opp>;
+	performance-domains = <&cpufreq_e>;
+	status = "okay";
+};
 
-		cpu4: cpu@4 {
-			compatible = "apple,t8142-e";
-			device_type = "cpu";
-			reg = <0 0x4>;
-			operating-points-v2 = <&ecluster_opp>;
-			performance-domains = <&cpufreq_e>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
+&cpu2 {
+	operating-points-v2 = <&ecluster_opp>;
+	performance-domains = <&cpufreq_e>;
+	status = "okay";
+};
 
-		cpu5: cpu@5 {
-			compatible = "apple,t8142-e";
-			device_type = "cpu";
-			reg = <0 0x5>;
-			operating-points-v2 = <&ecluster_opp>;
-			performance-domains = <&cpufreq_e>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
+&cpu3 {
+	operating-points-v2 = <&ecluster_opp>;
+	performance-domains = <&cpufreq_e>;
+	status = "okay";
+};
 
-		cpu6: cpu@10100 {
-			compatible = "apple,t8142-p";
-			device_type = "cpu";
-			reg = <0 0x10100>;
-			operating-points-v2 = <&pcluster_opp>;
-			performance-domains = <&cpufreq_p>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
+&cpu4 {
+	operating-points-v2 = <&ecluster_opp>;
+	performance-domains = <&cpufreq_e>;
+	status = "okay";
+};
 
-		cpu7: cpu@10101 {
-			compatible = "apple,t8142-p";
-			device_type = "cpu";
-			reg = <0 0x10101>;
-			operating-points-v2 = <&pcluster_opp>;
-			performance-domains = <&cpufreq_p>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
+&cpu5 {
+	operating-points-v2 = <&ecluster_opp>;
+	performance-domains = <&cpufreq_e>;
+	status = "okay";
+};
 
-		cpu8: cpu@10102 {
-			compatible = "apple,t8142-p";
-			device_type = "cpu";
-			reg = <0 0x10102>;
-			operating-points-v2 = <&pcluster_opp>;
-			performance-domains = <&cpufreq_p>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
+&cpu6 {
+	operating-points-v2 = <&pcluster_opp>;
+	performance-domains = <&cpufreq_p>;
+	status = "okay";
+};
 
-		cpu9: cpu@10103 {
-			compatible = "apple,t8142-p";
-			device_type = "cpu";
-			reg = <0 0x10103>;
-			operating-points-v2 = <&pcluster_opp>;
-			performance-domains = <&cpufreq_p>;
-			enable-method = "spin-table";
-			cpu-release-addr = <0 0>; /* Filled by the loader. */
-		};
-	};
+&cpu7 {
+	operating-points-v2 = <&pcluster_opp>;
+	performance-domains = <&cpufreq_p>;
+	status = "okay";
+};
 
-	timer {
-		compatible = "arm,armv8-timer";
-		interrupts = <AIC_FIQ AIC_TMR_GUEST_PHYS IRQ_TYPE_LEVEL_HIGH>,
-			     <AIC_FIQ AIC_TMR_GUEST_VIRT IRQ_TYPE_LEVEL_HIGH>,
-			     <AIC_FIQ AIC_TMR_HV_PHYS IRQ_TYPE_LEVEL_HIGH>,
-			     <AIC_FIQ AIC_TMR_HV_VIRT IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "phys", "virt", "hyp-phys", "hyp-virt";
-	};
+&cpu8 {
+	operating-points-v2 = <&pcluster_opp>;
+	performance-domains = <&cpufreq_p>;
+	status = "okay";
+};
 
-	clkref: clock-ref {
-		compatible = "fixed-clock";
-		#clock-cells = <0>;
-		clock-frequency = <24000000>;
-	};
+&cpu9 {
+	operating-points-v2 = <&pcluster_opp>;
+	performance-domains = <&cpufreq_p>;
+	status = "okay";
+};
 
-	soc {
-		compatible = "simple-bus";
-		#address-cells = <2>;
-		#size-cells = <2>;
-		ranges;
-		nonposted-mmio;
-
-		aic: interrupt-controller@381000000 {
-			compatible = "apple,t8142-aic3", "apple,t8122-aic3";
-			interrupt-controller;
-			#interrupt-cells = <3>;
-			reg = <3 0x81000000 0 0x1cc000>,
-			      <3 0x81040000 0 0x4000>;
-			reg-names = "core", "event";
-		};
+&{/timer} {
+	status = "okay";
+};
 
-		serial0: serial@3a5200000 {
-			compatible = "apple,s5l-uart";
-			reg = <3 0xa5200000 0 0x4000>;
-			reg-io-width = <4>;
-			interrupts = <AIC_IRQ 1231 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&clkref>, <&clkref>;
-			clock-names = "uart", "clk_uart_baud0";
-			status = "disabled";
-		};
+&aic {
+	status = "okay";
+};
 
-		dockchannel: serial@38812c000 {
-			compatible = "apple,dockchannel-uart";
-			reg = <3 0x8812c000 0 0x4000>,
-			      <3 0x88128000 0 0x4000>,
-			      <3 0x8810c000 0 0x1000>;
-			reg-names = "data", "config", "irq";
-			interrupts = <AIC_IRQ 571 IRQ_TYPE_LEVEL_HIGH>;
-		};
-	};
+&dockchannel {
+	status = "okay";
 };
 
 #include "t8142-j813-display.dtsi"
@@ -218,8 +121,6 @@
 #include "t8142-j813-n1.dtsi"
 #include "t8142-j813-audio.dtsi"
 
-#include "t8142-peripherals.dtsi"
-
 &mtp_hid {
 	multi-touch {
 		firmware-name = "apple/tpmtfw-j813.bin";

From 47dd5ea60da5db5b50a8632fa8f8b7946da2f44e Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:29:53 +0700
Subject: [PATCH 02/21] arm64: dts: apple: t8142-j815: Add the J813 power
 domains and PMP

J815 has J813's PMGR power domains, PMP, QSPI and FPWM. Include
t8142-j813-peripherals.dtsi, which J813 now builds on t8142.dtsi, in
place of the board's own PMGR and MTP DART enables. The PMP takes the
J815 board-id from the ADT (0x26).

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set
in a J815 tree that included the whole J813 board.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 36 +++++++++++++-----------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index d7ef154a20c6c..1af612c9bbbd1 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -2,12 +2,20 @@
 /*
  * Apple MacBook Air (15-inch, M5), J815.
  *
- * Boots on the T8142 inventory with the resources its ADT (25G83) shares
- * with J813: CPUs, timer, AIC, DockChannel UART, PMGR, CPU performance
- * states, PMC, SMC, the MTP keyboard and trackpad, ANS NVMe, watchdog and
- * PMU. The loader supplies usable memory, CPU release addresses and
- * framebuffer geometry. Audio, display, USB, camera, GPU and radios are not
- * described yet: their J815 wiring has not been checked.
+ * J815 is the 15-inch sibling of J813 on the same T8142 die. It uses the
+ * J813 board fragments and overrides what the J815 ADT shows to be
+ * different:
+ *
+ *  - /chosen board-id 0x26 (J813: 0x24)
+ *  - 15.3" 2880x1864 panel (2880x1800 below the notch), 326 x 211 mm
+ *  - six SN012776 speaker amplifiers on i2c3 (0x38-0x3d: two tweeters and
+ *    four force-cancelling woofers); J813 has four
+ *  - ISP sensor-type 0x72 (J813: 0x71)
+ *  - MTP hid-merge-personality C1FD3,3 (J813: C1FD1,4)
+ *
+ * The rest of the J813/J815 ADT difference is firmware selection (AOP
+ * j815aop, acoustic-id 0x2b), ADMAC speaker channel counts and higher
+ * CLPC package power limits.
  */
 /dts-v1/;
 
@@ -110,16 +118,7 @@
 	status = "okay";
 };
 
-&pmgr {
-	status = "okay";
-};
-
-&mtp_dart {
-	/* Keep host allocations clear of firmware's low IOVA mappings. */
-	apple,dma-range = <0 0x02000000 0 0x10000000>;
-	status = "okay";
-};
-
+#include "t8142-j813-peripherals.dtsi"
 #include "t8142-j813-j815.dtsi"
 
 &mtp_hid {
@@ -129,4 +128,7 @@
 	};
 };
 
-/* Unexposed chassis port instances remain described and disabled. */
+&pmp {
+	/* ADT /chosen board-id (J815) */
+	apple,board-id = <38>;
+};

From 2c2e7a0ed431a84155c8bf216b9e905ac2054141 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:29:54 +0700
Subject: [PATCH 03/21] arm64: dts: apple: t8142-j815: Add USB

The J815 ADT describes both Type-C ports like J813's: ATC PHYs, DWC3
controllers, DARTs and the CD3218B controllers on the same buses.
Include t8142-j813-usb.dtsi.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board. A SuperSpeed Plus hub
and the USB 2/3 devices behind it enumerate, and USB-C headphones play
audio.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 1af612c9bbbd1..787c0013484d8 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -120,6 +120,7 @@
 
 #include "t8142-j813-peripherals.dtsi"
 #include "t8142-j813-j815.dtsi"
+#include "t8142-j813-usb.dtsi"
 
 &mtp_hid {
 	multi-touch {

From 159246c8a226345d2ff6c50459161b5e044adedf Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:29:55 +0700
Subject: [PATCH 04/21] arm64: dts: apple: t8142-j815: Add the display

Include t8142-j813-display.dtsi and describe the J815 panel: 15.3-inch,
2880x1864 (2880x1800 below the notch), 326 x 211 mm.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board. With the macOS 27.0 DCP
firmware this needs the FW27 display support in Linux #1413; the console
and a KWin session run on the panel.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 787c0013484d8..9657b33cdfe35 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -118,6 +118,7 @@
 	status = "okay";
 };
 
+#include "t8142-j813-display.dtsi"
 #include "t8142-j813-peripherals.dtsi"
 #include "t8142-j813-j815.dtsi"
 #include "t8142-j813-usb.dtsi"
@@ -133,3 +134,10 @@
 	/* ADT /chosen board-id (J815) */
 	apple,board-id = <38>;
 };
+
+&panel {
+	compatible = "apple,panel-j815", "apple,panel";
+	width-mm = <326>;
+	height-mm = <211>;
+	adj-height-mm = <204>;
+};

From 6c6da70eac57ceb4bcbaafd63520e34ec5fb2403 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:29:57 +0700
Subject: [PATCH 05/21] arm64: dts: apple: t8142-j815: Add the GPU

The J815 GPU is J813's. Include t8142-j813-gpu.dtsi.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board. With the macOS 27.0
firmware this needs Linux #1413; the GPU driver initializes and KWin
renders through Mesa.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 9657b33cdfe35..c843c7671957e 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -119,6 +119,7 @@
 };
 
 #include "t8142-j813-display.dtsi"
+#include "t8142-j813-gpu.dtsi"
 #include "t8142-j813-peripherals.dtsi"
 #include "t8142-j813-j815.dtsi"
 #include "t8142-j813-usb.dtsi"

From 64e2006924d2161226705a944f03b9cb2cc3cb52 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:29:58 +0700
Subject: [PATCH 06/21] arm64: dts: apple: t8142-j815: Add the video decoder

Include t8142-j813-avd.dtsi: J815 has J813's AVD, DART and power domain.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board. With avd-fw-v5-t2 the
decoder probes and decodes through v4l2-request/VA-API: H.264 High 1080p
and HEVC Main 720p in mpv (vaapi-copy, one AVD interrupt per frame, no
kernel errors).

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index c843c7671957e..78d6e0fc6e7cb 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -123,6 +123,7 @@
 #include "t8142-j813-peripherals.dtsi"
 #include "t8142-j813-j815.dtsi"
 #include "t8142-j813-usb.dtsi"
+#include "t8142-j813-avd.dtsi"
 
 &mtp_hid {
 	multi-touch {

From 952174ec767b324b225ccc2be5ad9ad464b8c19b Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:29:59 +0700
Subject: [PATCH 07/21] arm64: dts: apple: t8142-j815: Add the camera ISP

Include t8142-j813-isp.dtsi. The J815 ADT gives the ISP sensor-type 0x72
(J813: 0x71).

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board. The ISP firmware boots
and the camera streams.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 78d6e0fc6e7cb..8dcc974e374cd 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -124,6 +124,7 @@
 #include "t8142-j813-j815.dtsi"
 #include "t8142-j813-usb.dtsi"
 #include "t8142-j813-avd.dtsi"
+#include "t8142-j813-isp.dtsi"
 
 &mtp_hid {
 	multi-touch {
@@ -143,3 +144,8 @@
 	height-mm = <211>;
 	adj-height-mm = <204>;
 };
+
+&isp {
+	/* J815 ADT /arm-io/isp sensor-type */
+	apple,platform-id = <0x72>;
+};

From e33cb73bb75b4fc2b7d5e03226d6a43d81871329 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:30:01 +0700
Subject: [PATCH 08/21] arm64: dts: apple: t8142-j815: Add N1 Wi-Fi and
 Bluetooth

Include t8142-j813-n1.dtsi for the N1 on apcie port 0. Describe the N1's
three PCI functions and alias wifi0 and bluetooth0 to them, so the
loader can fill in the factory MAC and BD addresses, as on T6050.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board. Wi-Fi connects to WPA2
networks, and Bluetooth LE devices pair and reconnect. Both use the
factory addresses.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 44 ++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 8dcc974e374cd..9a043108e6c21 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -125,6 +125,7 @@
 #include "t8142-j813-usb.dtsi"
 #include "t8142-j813-avd.dtsi"
 #include "t8142-j813-isp.dtsi"
+#include "t8142-j813-n1.dtsi"
 
 &mtp_hid {
 	multi-touch {
@@ -149,3 +150,46 @@
 	/* J815 ADT /arm-io/isp sensor-type */
 	apple,platform-id = <0x72>;
 };
+
+/*
+ * N1 functions behind apcie port 0 (0000:00:00.0 -> 01:00.{0,1,2}), so the
+ * loader has somewhere to put the factory addresses: it copies ADT /chosen
+ * mac-address-wifi0 and mac-address-bluetooth0 into the wifi0/bluetooth0
+ * alias targets, as on T6050 (t6050-j716s.dts).
+ */
+/ {
+	aliases {
+		wifi0 = &n1_alpha;
+		bluetooth0 = &n1_beta;
+	};
+};
+
+&pcie0 {
+	n1_port: pci@0,0 {
+		device_type = "pci";
+		reg = <0x0 0x0 0x0 0x0 0x0>;
+		bus-range = <1 1>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		ranges;
+
+		n1_control: control@0,0 {
+			compatible = "pci106b,1900";
+			reg = <0x10000 0x0 0x0 0x0 0x0>;
+		};
+
+		n1_alpha: wifi@0,1 {
+			compatible = "pci106b,1902";
+			reg = <0x10100 0x0 0x0 0x0 0x0>;
+			/* Filled by the loader */
+			local-mac-address = [00 00 00 00 00 00];
+		};
+
+		n1_beta: bluetooth@0,2 {
+			compatible = "pci106b,1903";
+			reg = <0x10200 0x0 0x0 0x0 0x0>;
+			/* Filled by the loader */
+			local-bd-address = [00 00 00 00 00 00];
+		};
+	};
+};

From 66ac4cba49cce90cf4bca42a2cc2f073ea917a96 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:30:02 +0700
Subject: [PATCH 09/21] arm64: dts: apple: t8142-j815: Add the AOP, pin
 controllers and I2C

Include t8142-j813-audio.dtsi for the AOP, the AP and NUB pin
controllers, the ADMACs and the I2C buses with the headphone jack codec
and speaker amplifiers. J815 has six speaker amplifiers where J813 has
four, so keep J813's sound card and the AOP audio service disabled.
The J815 speaker layout is a separate change.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board, with audio enabled. The
AOP boots and its services come up. This exact variant, with audio
disabled, has been compile-tested only.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 9a043108e6c21..09b437c555ea7 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -126,6 +126,7 @@
 #include "t8142-j813-avd.dtsi"
 #include "t8142-j813-isp.dtsi"
 #include "t8142-j813-n1.dtsi"
+#include "t8142-j813-audio.dtsi"
 
 &mtp_hid {
 	multi-touch {
@@ -193,3 +194,17 @@
 		};
 	};
 };
+
+/*
+ * J815 has six speaker amplifiers, not J813's four. Keep J813's sound card
+ * and the AOP audio service off until the J815 speaker layout is described.
+ */
+&aop_audio {
+	status = "disabled";
+};
+
+/ {
+	sound {
+		status = "disabled";
+	};
+};

From cb65d31f2303ecf64c65d450a81660b551d36076 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:30:03 +0700
Subject: [PATCH 10/21] arm64: dts: apple: t8142-j815: Add the ambient light
 sensor

The J815's AOP "als" service is an ST VD6286, as on the M4 Pro, not
T8140's CT817. Give the service device its compatible so aop_als binds
and sends the per-device calibration.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set in
a J815 tree that included the whole J813 board. The sensor reports lux
and colour temperature.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 09b437c555ea7..e0dd2086d8f08 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -152,6 +152,19 @@
 	apple,platform-id = <0x72>;
 };
 
+/*
+ * Ambient light sensor, the AOP's "als" service: an ST VD6286, as on the
+ * M4 Pro, not T8140's CT817. aop_als sends it the per-device calibration
+ * (apple/aop-als-cal.bin) as its calibration property. There is no
+ * firmware-name: that names the CT817 setup-port message, which this sensor
+ * does not take.
+ */
+&aop {
+	aop_als: als {
+		compatible = "apple,t8142-aop-als", "apple,aop-als";
+	};
+};
+
 /*
  * N1 functions behind apcie port 0 (0000:00:00.0 -> 01:00.{0,1,2}), so the
  * loader has somewhere to put the factory addresses: it copies ADT /chosen

From fb651167fc3b7930fa52adb8beb26686cd0ff395 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:30:04 +0700
Subject: [PATCH 11/21] arm64: dts: apple: t8142-j815: Add SMC power sensors
 and the die zone

The discovered SMC temperatures carry no power rails and no SoC die
zone. Add the total system, AC input and 3.8 V rail power, the AC and
battery voltages and the AC current, and J704's T8142 die key list for
the SoC die thermal zone.

Tested on J815 (MacBook Air 15-inch, M5) with the equivalent node set
in a J815 tree that included the whole J813 board.

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index e0dd2086d8f08..6891dd9f0ef7a 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -208,6 +208,55 @@
 	};
 };
 
+/*
+ * SMC sensors beyond the discovered temperatures. Only non-temperature nodes
+ * may be added here: a temperature-* node would stop
+ * apple,discover-temperatures. Keys the SMC lacks are skipped at probe. The
+ * die key list is J704's (same T8142): the listed keys form the SoC die
+ * thermal zone.
+ */
+&smc {
+	hwmon {
+		apple,soc-die-keys = "Te04", "Te08", "Te0C", "Te0R",
+				     "Tp00", "Tp04", "Tp0C", "Tp0G", "Tp0O",
+				     "Tp0R", "Tp0X", "Tp0a", "Tp0p", "Tp0u",
+				     "Tp0y", "Tp12", "Tp16", "Tp1E",
+				     "Tg0U", "Tg0X", "Tg0d", "Tg0g", "Tg0j",
+				     "Tg1Y", "Tg1c", "Tg1g";
+		apple,thermal-pressure-key = "mTPL";
+
+		power-PSTR {
+			apple,key-id = "PSTR";
+			label = "Total System Power";
+		};
+
+		power-PDTR {
+			apple,key-id = "PDTR";
+			label = "AC Input Power";
+		};
+
+		power-PMVR {
+			apple,key-id = "PMVR";
+			label = "3.8 V Rail Power";
+		};
+
+		voltage-VD0R {
+			apple,key-id = "VD0R";
+			label = "AC Input Voltage";
+		};
+
+		voltage-SBAV {
+			apple,key-id = "SBAV";
+			label = "Battery Voltage";
+		};
+
+		current-ID0R {
+			apple,key-id = "ID0R";
+			label = "AC Input Current";
+		};
+	};
+};
+
 /*
  * J815 has six speaker amplifiers, not J813's four. Keep J813's sound card
  * and the AOP audio service off until the J815 speaker layout is described.

From 4cb30f332b5b4c58876318427f583b3148af6ca5 Mon Sep 17 00:00:00 2001
From: Nick <nekreshen@yandex.ru>
Date: Wed, 11 Nov 2026 09:30:06 +0700
Subject: [PATCH 12/21] arm64: dts: apple: t8142-j815: Add the SEP and the
 Touch ID sensor

From the J815 ADT (macOS 27.0): the SEP is a pre-booted
iop-sep,ascwrap-v6 at 0x30a600000 with its ASC mailbox at +0x8000. Its
t8110 DART uses the BIT(40) input aperture, as on T8132. The Touch ID
sensor is on spi2 (0x3a5108000, 8 MHz, CS0, power domain SPI2 under
SPI_P), with power on NUB GPIO 36 and data-ready on AP GPIO 200. Alias
the SEP so the loader can reserve its firmware and copy the boot
manifests onto the node, and expose the two sensor pins.

The SEP and its DART stay disabled: the SEP driver enables them.

Tested on J815 with the J815 SEP profile: the SEP attaches, the sensor
binds on spi2 and comes up in about 40 ms, and fingerprints enrol and
match (sudo with the finger).

Assisted-by: Claude Opus 5.5
Signed-off-by: Nick <nekreshen@yandex.ru>
---
 arch/arm64/boot/dts/apple/t8142-j815.dts | 100 +++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 6891dd9f0ef7a..741bfa2c0e5d2 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -175,6 +175,12 @@
 	aliases {
 		wifi0 = &n1_alpha;
 		bluetooth0 = &n1_beta;
+		/*
+		 * The loader finds the SEP through this alias: it reserves SEPFW
+		 * and copies the boot's local-policy and iBoot manifests onto
+		 * the node.
+		 */
+		sep = &sep;
 	};
 };
 
@@ -257,6 +263,100 @@
 	};
 };
 
+/*
+ * Secure Enclave and the Touch ID sensor. All values are from the J815 ADT
+ * (macOS 27.0):
+ *  - sep: iop-sep,ascwrap-v6 at 0x30a600000 (0x88000), pre-booted by iBoot
+ *    (sepfw-booted), so apple_sep warm-attaches; its mailbox is the ASC
+ *    mailbox at +0x8000, AIC 445-448 (ADT order 446,445,448,447 as on the
+ *    AOP: send-empty..recv-not-empty ascending).
+ *  - dart-sep: t8110 at 0x308b80000, irq 455; input aperture vm-base-0
+ *    0x10000004000 + vm-size-0 0xffff0000 (the BIT(40) alias, as T8132).
+ *  - spi2 at 0x3a5108000, irq 0x4d9; PMGR device SPI2 at +0x440, parent
+ *    SPI_P (id 94).
+ *  - mesa: "biosensor,mesa", sensor-id V3, 8 MHz, CS0; power
+ *    function-mesa_pwr = NUB GPIO pin 36; data-ready interrupt on AP
+ *    GPIO pin 200.
+ * The SEP and its DART stay disabled here: apple_sep enables them at module
+ * init (drivers/soc/apple/dt.rs).
+ */
+&pmgr {
+	ps_spi2: power-controller@440 {
+		compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
+		reg = <0x440 4>;
+		#power-domain-cells = <0>;
+		#reset-cells = <0>;
+		power-domains = <&ps_spi_p>;
+		label = "spi2";
+	};
+};
+
+&{/soc} {
+	sep: sep@30a600000 {
+		compatible = "apple,sep";
+		reg = <0x3 0x0a600000 0x0 0x88000>;
+		mboxes = <&sep_mbox>;
+		mbox-names = "mbox";
+		iommus = <&sep_dart 0>;
+		status = "disabled";
+	};
+
+	sep_mbox: mbox@30a608000 {
+		compatible = "apple,t8142-asc-mailbox", "apple,asc-mailbox-v4";
+		reg = <0x3 0x0a608000 0x0 0x4000>;
+		interrupt-parent = <&aic>;
+		interrupts = <AIC_IRQ 445 IRQ_TYPE_LEVEL_HIGH>,
+			     <AIC_IRQ 446 IRQ_TYPE_LEVEL_HIGH>,
+			     <AIC_IRQ 447 IRQ_TYPE_LEVEL_HIGH>,
+			     <AIC_IRQ 448 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "send-empty", "send-not-empty",
+				  "recv-empty", "recv-not-empty";
+		#mbox-cells = <0>;
+		status = "okay";
+	};
+
+	spi2: spi@3a5108000 {
+		compatible = "apple,t8142-spi", "apple,t8103-spi";
+		reg = <0x3 0xa5108000 0x0 0x4000>;
+		interrupt-parent = <&aic>;
+		interrupts = <AIC_IRQ 1241 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&clkref>;
+		power-domains = <&ps_spi2>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "okay";
+
+		mesa: fingerprint@0 {
+			compatible = "apple,mesa-fingerprint";
+			reg = <0>;
+			spi-max-frequency = <8000000>;
+			spi-cpol;
+			spi-cs-setup-delay-ns = <20>;
+			spi-cs-hold-delay-ns = <20>;
+			enable-gpios = <&pinctrl_nub 36 GPIO_ACTIVE_HIGH>;
+			interrupt-parent = <&pinctrl_ap>;
+			interrupts = <200 IRQ_TYPE_EDGE_RISING>;
+			/* Per-device files, built from the Mac's own factory records. */
+			firmware-name = "apple/mesacal-j815.bin", "apple/msrk-j815.bin";
+			status = "okay";
+		};
+	};
+};
+
+&sep_dart {
+	apple,dma-range = /bits/ 64 <0x10000004000 0xffff0000>;
+	apple,dma-offset = /bits/ 64 <0x0>;
+};
+
+/* Expose the sensor's two pins next to the ones sound uses. */
+&pinctrl_ap {
+	gpio-reserved-ranges = <0 100>, <101 49>, <152 48>, <201 23>;
+};
+
+&pinctrl_nub {
+	gpio-reserved-ranges = <0 18>, <19 17>, <37 3>;
+};
+
 /*
  * J815 has six speaker amplifiers, not J813's four. Keep J813's sound card
  * and the AOP audio service off until the J815 speaker layout is described.

From cf92f98599eb59c6480b58d877bde1b6dfd92fed Mon Sep 17 00:00:00 2001
From: Dj <43033058+DjDeveloperr@users.noreply.github.com>
Date: Wed, 11 Nov 2026 13:45:51 -0500
Subject: [PATCH 13/21] dt-bindings: apple: describe the existing T8142
 peripheral profiles

Match the existing DT and public driver interfaces: keep the specific fallback chains, T8142-only ALS, eight ISP power domains versus fourteen on T8140, and the two-mailbox/six-region T8142 GPU profile. Preserve the constraints on other SoCs. No DT resource values change.

Validated with dtschema 2026.9 strict document/reference checks and targeted processed-schema positive and negative cases. Full DTB validation and the draft J813 hardware gate remain separate.

Signed-off-by: Diljit Singh <hey@djdev.me>
---
 .../devicetree/bindings/gpu/apple,agx.yaml    | 64 +++++++++++++++++--
 .../devicetree/bindings/i2c/apple,i2c.yaml    |  1 +
 .../bindings/iio/light/apple,aop-als.yaml     |  2 +
 .../bindings/mailbox/apple,mailbox.yaml       |  6 ++
 .../bindings/media/apple,t8140-isp.yaml       | 54 +++++++++++-----
 .../bindings/pinctrl/apple,pinctrl.yaml       |  4 ++
 .../bindings/soc/apple/apple,t8152-aop.yaml   | 22 +++++++
 .../devicetree/bindings/spi/apple,spi.yaml    |  1 +
 8 files changed, 132 insertions(+), 22 deletions(-)

diff --git a/Documentation/devicetree/bindings/gpu/apple,agx.yaml b/Documentation/devicetree/bindings/gpu/apple,agx.yaml
index 992783b2dc68f..273b91fd04f4f 100644
--- a/Documentation/devicetree/bindings/gpu/apple,agx.yaml
+++ b/Documentation/devicetree/bindings/gpu/apple,agx.yaml
@@ -23,6 +23,7 @@ properties:
           - apple,agx-t6050
           - apple,agx-t8132
           - apple,agx-t8140
+          - apple,agx-t8142
       - items:
           - const: apple,agx-t8103
           - const: apple,agx-g13g
@@ -83,13 +84,7 @@ properties:
 
   memory-region-names:
     minItems: 3
-    items:
-      - const: ttbs
-      - const: pagetables
-      - const: handoff
-      - enum: [hw-cal-a, shared-l2, fw-data]
-      - enum: [hw-cal-b, fw-text, l2-pagetables]
-      - enum: [globals, fw-data, fw-text]
+    maxItems: 6
 
   apple,clpc:
     $ref: /schemas/types.yaml#/definitions/phandle
@@ -460,6 +455,7 @@ allOf:
                 - apple,agx-t6041
                 - apple,agx-t8132
                 - apple,agx-t8140
+                - apple,agx-t8142
                 - apple,agx-g17s
     then:
       properties:
@@ -486,6 +482,60 @@ allOf:
       required:
         - apple,firmware-abi
 
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apple,agx-t8142
+    then:
+      properties:
+        reg:
+          items:
+            - description: GFX coprocessor control registers
+            - description: GPU block MMIO registers
+        reg-names:
+          items:
+            - const: asc
+            - const: sgx
+        mboxes:
+          items:
+            - description: GFX coprocessor mailbox
+            - description: GFX1 coprocessor mailbox
+        memory-region:
+          items:
+            - description: GPU MMU TTBs
+            - description: GPU MMU page tables
+            - description: Shared GPU MMU handoff structure
+            - description: Shared L2 page tables
+            - description: GFX firmware data
+            - description: GFX1 firmware data
+        memory-region-names:
+          items:
+            - const: ttbs
+            - const: pagetables
+            - const: handoff
+            - const: shared-l2
+            - const: gfx-data
+            - const: gfx1-data
+      required:
+        - reg-names
+        - mboxes
+        - memory-region
+        - memory-region-names
+        - power-domains
+        - operating-points-v2
+    else:
+      properties:
+        memory-region-names:
+          minItems: 3
+          items:
+            - const: ttbs
+            - const: pagetables
+            - const: handoff
+            - enum: [hw-cal-a, shared-l2, fw-data]
+            - enum: [hw-cal-b, fw-text, l2-pagetables]
+            - enum: [globals, fw-data, fw-text]
+
 additionalProperties: false
 
 examples:
diff --git a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml
index f2e16482d9218..6c649719118af 100644
--- a/Documentation/devicetree/bindings/i2c/apple,i2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/apple,i2c.yaml
@@ -31,6 +31,7 @@ properties:
               - apple,t8122-i2c
               - apple,t8132-i2c
               - apple,t8140-i2c
+              - apple,t8142-i2c
           - const: apple,t8103-i2c
       - items:
           - enum:
diff --git a/Documentation/devicetree/bindings/iio/light/apple,aop-als.yaml b/Documentation/devicetree/bindings/iio/light/apple,aop-als.yaml
index 1bfb009fa57ea..198195636be51 100644
--- a/Documentation/devicetree/bindings/iio/light/apple,aop-als.yaml
+++ b/Documentation/devicetree/bindings/iio/light/apple,aop-als.yaml
@@ -21,6 +21,7 @@ select:
         enum:
           - apple,t6020-aop-als
           - apple,t8112-aop-als
+          - apple,t8142-aop-als
   required:
     - compatible
 
@@ -30,6 +31,7 @@ properties:
       - enum:
           - apple,t6020-aop-als
           - apple,t8112-aop-als
+          - apple,t8142-aop-als
       - const: apple,aop-als
 
 required:
diff --git a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
index add726470307d..da402a92c62c9 100644
--- a/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
+++ b/Documentation/devicetree/bindings/mailbox/apple,mailbox.yaml
@@ -76,6 +76,12 @@ properties:
           AOP setup-port mailbox with a separate register layout.
         const: apple,t8140-aop-setup-mailbox
 
+      - description:
+          T8142 AOP setup port, compatible with the T8140 setup layout.
+        items:
+          - const: apple,t8142-aop-setup-mailbox
+          - const: apple,t8140-aop-setup-mailbox
+
       - description:
           An older ASC mailbox interface found on T2 and A11 that is also
           used for the NVMe coprocessor and the system management
diff --git a/Documentation/devicetree/bindings/media/apple,t8140-isp.yaml b/Documentation/devicetree/bindings/media/apple,t8140-isp.yaml
index 1671fa01bec96..9903d6de82772 100644
--- a/Documentation/devicetree/bindings/media/apple,t8140-isp.yaml
+++ b/Documentation/devicetree/bindings/media/apple,t8140-isp.yaml
@@ -57,21 +57,8 @@ properties:
       - description: Third ISP DART stream
 
   power-domains:
-    items:
-      - description: ISP system domain
-      - description: ISP CPU domain
-      - description: ISP CPU core 0 domain
-      - description: ISP CPU core 1 domain
-      - description: ISP FE domain
-      - description: ISP DPRX domain
-      - description: ISP secure domain
-      - description: ISP STS0 domain
-      - description: ISP STS1 domain
-      - description: ISP Pearl domain
-      - description: ISP BE domain
-      - description: ISP CLR domain
-      - description: ISP CVD domain
-      - description: ISP CVM domain
+    minItems: 8
+    maxItems: 14
 
   memory-region:
     maxItems: 1
@@ -135,6 +122,43 @@ properties:
         additionalProperties: false
     additionalProperties: false
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apple,t8142-isp
+    then:
+      properties:
+        power-domains:
+          items:
+            - description: ISP system domain
+            - description: ISP CPU domain
+            - description: ISP CPU core 0 domain
+            - description: ISP FE domain
+            - description: ISP DPRX domain
+            - description: ISP STS0 domain
+            - description: ISP BE domain
+            - description: ISP CLR domain
+    else:
+      properties:
+        power-domains:
+          items:
+            - description: ISP system domain
+            - description: ISP CPU domain
+            - description: ISP CPU core 0 domain
+            - description: ISP CPU core 1 domain
+            - description: ISP FE domain
+            - description: ISP DPRX domain
+            - description: ISP secure domain
+            - description: ISP STS0 domain
+            - description: ISP STS1 domain
+            - description: ISP Pearl domain
+            - description: ISP BE domain
+            - description: ISP CLR domain
+            - description: ISP CVD domain
+            - description: ISP CVM domain
+
 required:
   - compatible
   - reg
diff --git a/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
index a8246b8db7ad9..d61f22ad45103 100644
--- a/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml
@@ -29,6 +29,10 @@ properties:
               - apple,t8140-pinctrl
               - apple,t8152-pinctrl
           - const: apple,t8103-pinctrl
+      - items:
+          - const: apple,t8142-pinctrl
+          - const: apple,t8140-pinctrl
+          - const: apple,t8103-pinctrl
       - items:
           - const: apple,t6050-pinctrl
           - const: apple,t8132-pinctrl
diff --git a/Documentation/devicetree/bindings/soc/apple/apple,t8152-aop.yaml b/Documentation/devicetree/bindings/soc/apple/apple,t8152-aop.yaml
index b6ecd291c9438..f2054d7934b03 100644
--- a/Documentation/devicetree/bindings/soc/apple/apple,t8152-aop.yaml
+++ b/Documentation/devicetree/bindings/soc/apple/apple,t8152-aop.yaml
@@ -59,10 +59,32 @@ properties:
       Host DMA allocation window as a base and nonzero size, inside the root
       slots of this AOP DART stream that are free for the host.
 
+  als:
+    type: object
+    $ref: /schemas/iio/light/apple,aop-als.yaml#
+
   audio:
     type: object
     $ref: /schemas/sound/apple,t8152-aop-audio.yaml#
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apple,t8142-aop
+    then:
+      properties:
+        als:
+          properties:
+            compatible:
+              items:
+                - const: apple,t8142-aop-als
+                - const: apple,aop-als
+    else:
+      properties:
+        als: false
+
 required:
   - compatible
   - reg
diff --git a/Documentation/devicetree/bindings/spi/apple,spi.yaml b/Documentation/devicetree/bindings/spi/apple,spi.yaml
index 62d5afda0d310..70954d834fa8c 100644
--- a/Documentation/devicetree/bindings/spi/apple,spi.yaml
+++ b/Documentation/devicetree/bindings/spi/apple,spi.yaml
@@ -27,6 +27,7 @@ properties:
               - apple,t8122-spi
               - apple,t8132-spi
               - apple,t8140-spi
+              - apple,t8142-spi
           - const: apple,t8103-spi
       - items:
           - enum:

From f3d7f40425387b3deb1fdfd42ae0c78693e368e3 Mon Sep 17 00:00:00 2001
From: Dj <43033058+DjDeveloperr@users.noreply.github.com>
Date: Wed, 11 Nov 2026 13:46:16 -0500
Subject: [PATCH 14/21] dt-bindings: sound: carry the J813 audio metadata
 prerequisites

Carry byte-exact schema files from reviewed aurora-silicon/linux#1423 at 18fa06f4 so the shared J813/J815 DT can be checked without inventing a second binding implementation.

Original binding updates by Thomas Glanzmann, signed off in commits 9afc945d0cdb101e28b0102fbc7bd55c04d2c77f and bb9ad0e1029a0f6ca51c87cc858cffa60e5242a9. This is binding metadata only; no driver or speaker-protection adoption or parent edge is added. The M5 merge lane retains ownership of #1423. Later identical binding changes coalesce in an ordinary merge.

Signed-off-by: Diljit Singh <hey@djdev.me>
---
 .../devicetree/bindings/sound/apple,macaudio.yaml         | 2 ++
 Documentation/devicetree/bindings/sound/ti,tas27xx.yaml   | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/Documentation/devicetree/bindings/sound/apple,macaudio.yaml b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml
index 0d9004fab9c1d..f6e098134ab27 100644
--- a/Documentation/devicetree/bindings/sound/apple,macaudio.yaml
+++ b/Documentation/devicetree/bindings/sound/apple,macaudio.yaml
@@ -51,6 +51,8 @@ properties:
               - apple,j715-macaudio-jack
               - apple,j773-macaudio
               - apple,j773-macaudio-jack
+              - apple,j813-macaudio
+              - apple,j873-macaudio
           - const: apple,macaudio
       - description:
           Machines that share the speaker and jack layout of an earlier
diff --git a/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml b/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml
index 1f6bd7b4635b6..6071212d17c1e 100644
--- a/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml
+++ b/Documentation/devicetree/bindings/sound/ti,tas27xx.yaml
@@ -122,6 +122,14 @@ properties:
     $ref: /schemas/types.yaml#/definitions/uint32
     description: TDM TX voltage sense time slot.
 
+  ti,bclk-ratio:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    enum: [250]
+    description:
+      Fixed BCLK/FS ratio of the TDM frame, for a frame the amplifier's ratio
+      auto-detection does not accept (250 BCLKs on the Mac mini (M6, J873)
+      speaker).
+
   '#sound-dai-cells':
     # The codec has a single DAI, the #sound-dai-cells=<1>; case is left in for backward
     # compatibility but is deprecated.

From ec064e962ce072a4a36974f0cf2680e016eef5a7 Mon Sep 17 00:00:00 2001
From: Dj <43033058+DjDeveloperr@users.noreply.github.com>
Date: Wed, 11 Nov 2026 13:46:17 -0500
Subject: [PATCH 15/21] dt-bindings: net: distinguish the T8142 native Centauri
 profile

Identify the J815 native profile with a T8142-specific compatible while retaining the PCI1900 fallback. The generic driver continues to match the host/PCI ID and obtain firmware data from its root board table; no firmware/platform/protocol values are invented. Keep all three wire27 properties required for the older PCI-only T6050 profile and forbid mixing those properties into the native profile.

Only the J815 endpoint compatible changes. Shared SoC/J813 DT inputs and runtime resources remain unchanged. The J815 board firmware-table prerequisite is aurora-silicon/linux#1530.

Signed-off-by: Diljit Singh <hey@djdev.me>
---
 .../bindings/net/wireless/apple,centauri.yaml | 37 ++++++++++++++++---
 arch/arm64/boot/dts/apple/t8142-j815.dts      |  2 +-
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/wireless/apple,centauri.yaml b/Documentation/devicetree/bindings/net/wireless/apple,centauri.yaml
index f73dd9afceca1..8d226eec13091 100644
--- a/Documentation/devicetree/bindings/net/wireless/apple,centauri.yaml
+++ b/Documentation/devicetree/bindings/net/wireless/apple,centauri.yaml
@@ -17,11 +17,22 @@ description: |
   bootstrap. This binding does not authorize adopting an existing live
   firmware session or releasing another owner's retained DART streams.
 
+  The T8142 native transport uses the same PCI function IDs but is a
+  different firmware profile. Its SoC-specific compatible identifies this
+  binding profile; the generic PCI compatible is retained as the fallback.
+  Runtime driver selection continues to use the PCI ID and host SoC, and the
+  native driver selects personalized firmware and transport data from its
+  root-board match table rather than the T6050 wire-protocol properties.
+
 properties:
   compatible:
-    enum:
-      - pci106b,1900
-      - pci106b,1901
+    oneOf:
+      - enum:
+          - pci106b,1900
+          - pci106b,1901
+      - items:
+          - const: apple,t8142-centauri-control
+          - const: pci106b,1900
 
   reg:
     maxItems: 1
@@ -40,11 +51,25 @@ properties:
     const: 27
     description: Shared firmware wire protocol profile
 
+allOf:
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apple,t8142-centauri-control
+    then:
+      properties:
+        firmware-name: false
+        apple,centauri-platform-id: false
+        apple,centauri-protocol: false
+    else:
+      required:
+        - firmware-name
+        - apple,centauri-platform-id
+        - apple,centauri-protocol
+
 required:
   - compatible
   - reg
-  - firmware-name
-  - apple,centauri-platform-id
-  - apple,centauri-protocol
 
 additionalProperties: false
diff --git a/arch/arm64/boot/dts/apple/t8142-j815.dts b/arch/arm64/boot/dts/apple/t8142-j815.dts
index 741bfa2c0e5d2..57d1eacd87d60 100644
--- a/arch/arm64/boot/dts/apple/t8142-j815.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j815.dts
@@ -194,7 +194,7 @@
 		ranges;
 
 		n1_control: control@0,0 {
-			compatible = "pci106b,1900";
+			compatible = "apple,t8142-centauri-control", "pci106b,1900";
 			reg = <0x10000 0x0 0x0 0x0 0x0>;
 		};
 

From 9122abe45810509ac5065e207d242fecad7aea22 Mon Sep 17 00:00:00 2001
From: Dj <43033058+DjDeveloperr@users.noreply.github.com>
Date: Wed, 11 Nov 2026 16:41:24 -0500
Subject: [PATCH 16/21] dt-bindings: gpu: describe the seventh T8142 firmware
 region

Match the existing J813/J815 fw-data crash-log region and its ordered
seven-region tuple. Preserve the six-region maximum for other GPUs.
---
 Documentation/devicetree/bindings/gpu/apple,agx.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/gpu/apple,agx.yaml b/Documentation/devicetree/bindings/gpu/apple,agx.yaml
index 273b91fd04f4f..7079f80daaa88 100644
--- a/Documentation/devicetree/bindings/gpu/apple,agx.yaml
+++ b/Documentation/devicetree/bindings/gpu/apple,agx.yaml
@@ -81,10 +81,11 @@ properties:
       - description:
           Shared global variables, preserved firmware data or text segment of
           the loaded GPU firmware
+      - description: Additional firmware crash-log data on T8142
 
   memory-region-names:
     minItems: 3
-    maxItems: 6
+    maxItems: 7
 
   apple,clpc:
     $ref: /schemas/types.yaml#/definitions/phandle
@@ -509,6 +510,7 @@ allOf:
             - description: Shared L2 page tables
             - description: GFX firmware data
             - description: GFX1 firmware data
+            - description: Combined firmware data and shared read-only crash logs
         memory-region-names:
           items:
             - const: ttbs
@@ -517,6 +519,7 @@ allOf:
             - const: shared-l2
             - const: gfx-data
             - const: gfx1-data
+            - const: fw-data
       required:
         - reg-names
         - mboxes
@@ -526,6 +529,8 @@ allOf:
         - operating-points-v2
     else:
       properties:
+        memory-region:
+          maxItems: 6
         memory-region-names:
           minItems: 3
           items:

From 223d7d72fac4ed23473223c6deaa3c5f06a40ad0 Mon Sep 17 00:00:00 2001
From: Diljit Singh <hey@djdev.me>
Date: Thu, 12 Nov 2026 10:45:12 -0500
Subject: [PATCH 17/21] arm64: dts: apple: t8142-j813: add N1 factory address
 targets

Add the N1 control/Wi-Fi/Bluetooth PCI functions and wifi0/bluetooth0
aliases already used by J815, so the loader can populate the factory
addresses on J813. Keep the change board-local and omit the untested SEP
alias. Do not change Bluetooth experimental module options.

Based on the patch and owner report by @gig3m in linux#1532 comment
6828183980. The supplied block is carried exactly; its PCI topology
matches J815. Symbolic source checks preserve all307 original nodes and
properties and add only the four PCI nodes/two aliases. This is not a
new compiled-DTB or whole integrated hardware qualification.

The owner reports five boots/daily use of the 97f14725 feature on a
2b05915f composition with this block/local display patch, firmware26.6.2.
GPU and SEP remain untested; Bluetooth pairing required opt-in flags.
The independent Aura165 alias qualification/adoption gate remains.

Assisted-by: LLM
---
 arch/arm64/boot/dts/apple/t8142-j813.dts | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts
index 020cd3d6fe280..5b0c6299ae5b7 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j813.dts
@@ -121,6 +121,49 @@
 #include "t8142-j813-n1.dtsi"
 #include "t8142-j813-audio.dtsi"
 
+/*
+ * N1 functions behind apcie port 0 (0000:00:00.0 -> 01:00.{0,1,2}), so the
+ * loader has somewhere to put the factory addresses: it copies ADT /chosen
+ * mac-address-wifi0 and mac-address-bluetooth0 into the wifi0/bluetooth0
+ * alias targets. Same nodes as t8142-j815.dts (same N1, same PCI IDs).
+ */
+/ {
+	aliases {
+		wifi0 = &n1_alpha;
+		bluetooth0 = &n1_beta;
+	};
+};
+
+&pcie0 {
+	n1_port: pci@0,0 {
+		device_type = "pci";
+		reg = <0x0 0x0 0x0 0x0 0x0>;
+		bus-range = <1 1>;
+		#address-cells = <3>;
+		#size-cells = <2>;
+		ranges;
+
+		n1_control: control@0,0 {
+			compatible = "apple,t8142-centauri-control", "pci106b,1900";
+			reg = <0x10000 0x0 0x0 0x0 0x0>;
+		};
+
+		n1_alpha: wifi@0,1 {
+			compatible = "pci106b,1902";
+			reg = <0x10100 0x0 0x0 0x0 0x0>;
+			/* Filled by the loader */
+			local-mac-address = [00 00 00 00 00 00];
+		};
+
+		n1_beta: bluetooth@0,2 {
+			compatible = "pci106b,1903";
+			reg = <0x10200 0x0 0x0 0x0 0x0>;
+			/* Filled by the loader */
+			local-bd-address = [00 00 00 00 00 00];
+		};
+	};
+};
+
 &mtp_hid {
 	multi-touch {
 		firmware-name = "apple/tpmtfw-j813.bin";

From 70035185bd9c876357669f569811017f84724b0d Mon Sep 17 00:00:00 2001
From: Dj <43033058+DjDeveloperr@users.noreply.github.com>
Date: Thu, 12 Nov 2026 17:18:01 -0500
Subject: [PATCH 18/21] arm64/sep: describe J813 Touch ID and admit its T8142
 profile

Carry the J813 owner's SEP/mailbox/SPI/Mesa/DART block and board-specific
calibration filenames. Add the SEP alias and expose AP GPIO200/NUB GPIO36
while preserving the audio pins. Admit J813 only alongside the existing
J815 T8142 selector; retain other board and SoC admission boundaries.

Based on @gig3m's supplied patch and owner report in linux#1532 comment
6837017905. Add KUnit selector cases for both accepted boards and unknown,
missing or mismatched SoC/board identities. Local command creation failed
with EAGAIN; these new cases require the hosted Rust/QEMU checks.

This changes effective board admission: existing xart_writes=1 and
provision_keybag=1 defaults remain, with profile-inherited guard level1.
It is not read-only by default. Keep this follow-up draft pending SEP/XART
policy review, CI and a decision on the separate aurora-xart model-reporting
gap. No defaults, guard definitions, APFS checks or user state are changed.

The reported single-finger/read-only-then-write/reboot/macOS checks do not
qualify IRQ-only capture, multifinger, lockout or deep sleep. No hardware,
XART write, enrolment, provisioning or loader action was executed here.

Assisted-by: LLM
---
 arch/arm64/boot/dts/apple/t8142-j813.dts | 97 ++++++++++++++++++++++++
 drivers/soc/apple/profile.rs             | 27 ++++++-
 2 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts
index 5b0c6299ae5b7..5889b852793a0 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j813.dts
@@ -131,6 +131,12 @@
 	aliases {
 		wifi0 = &n1_alpha;
 		bluetooth0 = &n1_beta;
+		/*
+		 * The loader finds the SEP through this alias: it reserves SEPFW
+		 * and copies the boot's local-policy and iBoot manifests onto
+		 * the node.
+		 */
+		sep = &sep;
 	};
 };
 
@@ -171,3 +177,94 @@
 };
 
 /* Unexposed chassis port instances remain described and disabled. */
+
+/*
+ * Secure Enclave and the Touch ID sensor. All values are from the J813 ADT
+ * (macOS 27.0) and are the same as J815's:
+ *  - sep: iop-sep,ascwrap-v6 at 0x30a600000 (0x88000), sepfw-booted, so
+ *    apple_sep warm-attaches; ASC mailbox at +0x8000, AIC 445-448.
+ *  - dart-sep: t8110 at 0x308b80000, irq 455; vm-base-0 0x10000004000,
+ *    vm-size-0 0xffff0000.
+ *  - spi2 at 0x3a5108000, irq 1241; PMGR device SPI2 at +0x440, parent SPI_P.
+ *  - mesa: "biosensor,mesa", sensor-id 0x3356, 8 MHz, CS0; power
+ *    function-mesa_pwr = NUB GPIO pin 36; data-ready interrupt on AP GPIO
+ *    pin 200.
+ * The SEP and its DART stay disabled here: apple_sep enables them at module
+ * init (drivers/soc/apple/dt.rs).
+ */
+&pmgr {
+	ps_spi2: power-controller@440 {
+		compatible = "apple,t8142-pmgr-pwrstate", "apple,t8103-pmgr-pwrstate";
+		reg = <0x440 4>;
+		#power-domain-cells = <0>;
+		#reset-cells = <0>;
+		power-domains = <&ps_spi_p>;
+		label = "spi2";
+	};
+};
+
+&{/soc} {
+	sep: sep@30a600000 {
+		compatible = "apple,sep";
+		reg = <0x3 0x0a600000 0x0 0x88000>;
+		mboxes = <&sep_mbox>;
+		mbox-names = "mbox";
+		iommus = <&sep_dart 0>;
+		status = "disabled";
+	};
+
+	sep_mbox: mbox@30a608000 {
+		compatible = "apple,t8142-asc-mailbox", "apple,asc-mailbox-v4";
+		reg = <0x3 0x0a608000 0x0 0x4000>;
+		interrupt-parent = <&aic>;
+		interrupts = <AIC_IRQ 445 IRQ_TYPE_LEVEL_HIGH>,
+			     <AIC_IRQ 446 IRQ_TYPE_LEVEL_HIGH>,
+			     <AIC_IRQ 447 IRQ_TYPE_LEVEL_HIGH>,
+			     <AIC_IRQ 448 IRQ_TYPE_LEVEL_HIGH>;
+		interrupt-names = "send-empty", "send-not-empty",
+				  "recv-empty", "recv-not-empty";
+		#mbox-cells = <0>;
+		status = "okay";
+	};
+
+	spi2: spi@3a5108000 {
+		compatible = "apple,t8142-spi", "apple,t8103-spi";
+		reg = <0x3 0xa5108000 0x0 0x4000>;
+		interrupt-parent = <&aic>;
+		interrupts = <AIC_IRQ 1241 IRQ_TYPE_LEVEL_HIGH>;
+		clocks = <&clkref>;
+		power-domains = <&ps_spi2>;
+		#address-cells = <1>;
+		#size-cells = <0>;
+		status = "okay";
+
+		mesa: fingerprint@0 {
+			compatible = "apple,mesa-fingerprint";
+			reg = <0>;
+			spi-max-frequency = <8000000>;
+			spi-cpol;
+			spi-cs-setup-delay-ns = <20>;
+			spi-cs-hold-delay-ns = <20>;
+			enable-gpios = <&pinctrl_nub 36 GPIO_ACTIVE_HIGH>;
+			interrupt-parent = <&pinctrl_ap>;
+			interrupts = <200 IRQ_TYPE_EDGE_RISING>;
+			/* Per-device files, built from the Mac's own factory records. */
+			firmware-name = "apple/mesacal-j813.bin", "apple/msrk-j813.bin";
+			status = "okay";
+		};
+	};
+};
+
+&sep_dart {
+	apple,dma-range = /bits/ 64 <0x10000004000 0xffff0000>;
+	apple,dma-offset = /bits/ 64 <0x0>;
+};
+
+/* Expose the sensor's two pins next to the ones sound uses. */
+&pinctrl_ap {
+	gpio-reserved-ranges = <0 100>, <101 49>, <152 48>, <201 23>;
+};
+
+&pinctrl_nub {
+	gpio-reserved-ranges = <0 18>, <19 17>, <37 3>;
+};
diff --git a/drivers/soc/apple/profile.rs b/drivers/soc/apple/profile.rs
index ac5f573455b91..622c9cef21039 100644
--- a/drivers/soc/apple/profile.rs
+++ b/drivers/soc/apple/profile.rs
@@ -710,8 +710,9 @@ fn select(
     if has(b"apple,t8132") && (has(b"apple,j713") || has(b"apple,j715")) {
         return Ok(&T8132);
     }
-    // Only the J815, whose ADT was read; the J813's sensor bus is unchecked.
-    if has(b"apple,t8142") && has(b"apple,j815") {
+    // The J815 and the J813, whose ADTs were read (macOS 27.0 stub firmware):
+    // the J813's SEP, its DART, spi2 and the Mesa node carry the J815's values.
+    if has(b"apple,t8142") && (has(b"apple,j815") || has(b"apple,j813")) {
         return Ok(&T8142);
     }
     Err(ENODEV)
@@ -722,6 +723,28 @@ fn select(
 mod tests {
     use super::*;
 
+    #[test]
+    fn t8142_sensor_boards_require_the_matching_soc() {
+        let cases: [(&[u8], &[u8], bool); 7] = [
+            (b"apple,t8142", b"apple,j813", true),
+            (b"apple,t8142", b"apple,j815", true),
+            (b"apple,t8142", b"apple,j814", false),
+            (b"apple,t8142", b"", false),
+            (b"", b"apple,j813", false),
+            (b"apple,t8132", b"apple,j813", false),
+            (b"apple,t6050", b"apple,j815", false),
+        ];
+        for (soc, board, admitted) in cases {
+            let has = |c: &[u8]| c == soc || c == board;
+            let selected = select(&has, &|| &T6020);
+            if admitted {
+                assert!(matches!(selected, Ok(profile) if core::ptr::eq(profile, &T8142)));
+            } else {
+                assert!(selected.is_err());
+            }
+        }
+    }
+
     #[test]
     fn old_firmware_uses_the_legacy_key_store() {
         assert!(t6020_uses_sepos13(Some(b"iBoot-13822.79.1\0")));

From 09e6fbbc95cbebfb1997616053219dc3a89054df Mon Sep 17 00:00:00 2001
From: Diljit Singh <hey@djdev.me>
Date: Thu, 12 Nov 2026 17:39:16 -0500
Subject: [PATCH 19/21] arm64: dts: apple: describe the J813 AOP ambient light
 sensor

Carry gig3m's node from linux#1532 comment6837248959 exactly. The J813
27.0 ADT supplies the same VD6286 ALS service as J815. The owner reports
illuminance and color-temperature readings using installer-supplied
per-device calibration on the previously stated composed tree.

Keep calibration loading in aop_als; firmware-name would select the
different CT817 setup-port calibration path. Existing nodes/properties
are preserved and the added ALS node equals J815's. This source check
is not a new DTB build or physical boot. Require fresh CI and retain
the independent Aura165 alias qualification/adoption gate.

Based-on: @gig3m's patch and owner report6837248959
Assisted-by: LLM (Codex)
---
 arch/arm64/boot/dts/apple/t8142-j813.dts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts
index 5b0c6299ae5b7..94dc523b12d55 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j813.dts
@@ -121,6 +121,18 @@
 #include "t8142-j813-n1.dtsi"
 #include "t8142-j813-audio.dtsi"
 
+/*
+ * Ambient light sensor, the AOP's "als" service: an ST VD6286, as on J815
+ * (same ADT node, /arm-io/aop/iop-aop-nub/als). aop_als sends it the
+ * per-device calibration (apple/aop-als-cal.bin). No firmware-name: that
+ * names the CT817 setup-port message, which this sensor does not take.
+ */
+&aop {
+	aop_als: als {
+		compatible = "apple,t8142-aop-als", "apple,aop-als";
+	};
+};
+
 /*
  * N1 functions behind apcie port 0 (0000:00:00.0 -> 01:00.{0,1,2}), so the
  * loader has somewhere to put the factory addresses: it copies ADT /chosen

From 8cc280603527502505725ee758e53b455203c9bb Mon Sep 17 00:00:00 2001
From: Diljit Singh <hey@djdev.me>
Date: Thu, 12 Nov 2026 17:54:56 -0500
Subject: [PATCH 20/21] sep: name both T8142 Airs and cover J813 profile
 invariants

Address Ryan's review5883010555 of the J813 follow-up. Name both J813
and J815 in the diagnostic profile label. Add J704 as a negative board,
both Airs to the shared known-sensor test, T8142 to the BIT40 window
test and an explicit level-one guard assertion. Compare the selected
profile's stable name rather than promoted-constant pointer identity.

The production selector is unchanged. Apart from the diagnostic label,
T8142 profile fields, geometry, guard and defaults are exact previous
source. The reviewer accepts aurora-xart model coverage as a separate
utility PR; do not change it or user state here. The owner corrected
the report: guard1 was explicitly configured, not inherited at runtime.

Three actual KUnit bodies pass in a host Rust extraction using actual
profile definitions, selector and exact-head known-sensor IDs. Host
CStr/error/static-assert glue is used; this is not a kernel module,
arm64 QEMU KUnit or physical default-policy test. Fresh hosted checks
and the parent1532/loader-alias gate remain before merge.

Assisted-by: LLM (Codex)
---
 drivers/soc/apple/profile.rs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/drivers/soc/apple/profile.rs b/drivers/soc/apple/profile.rs
index 622c9cef21039..36814028c471b 100644
--- a/drivers/soc/apple/profile.rs
+++ b/drivers/soc/apple/profile.rs
@@ -500,17 +500,17 @@ pub(crate) const T8132: PlatformProfile = PlatformProfile {
     ..T8122
 };
 
-/// MacBook Air 15" M5 (J815). The J815 ADT (macOS 27.0 stub firmware) puts
+/// MacBook Air M5 (J813 and J815). Their ADTs (macOS 27.0 stub firmware) put
 /// the Mesa sensor (`V3`, the J700/J713/J714s generation) on spi2 at
 /// `0x3a5108000`, 8 MHz, chip select 0, with power on the NUB GPIO controller
 /// (pin 36) and data-ready on AP GPIO 200. The SEP is a pre-booted
 /// `iop-sep,ascwrap-v6` (`sepfw-booted`) behind a t8110 DART whose input
 /// aperture is the BIT(40) alias (`vm-base-0` 0x10000004000, `vm-size-0`
 /// 0xffff0000): the same SoC side as T8132 and T6050 (J714s, the M5 Pro).
-/// So this is T8132's profile with the sensor bus moved. On J815 the SEP
-/// attaches with it; the sensor session itself is not tested yet.
+/// So this is T8132's profile with the sensor bus moved. J813 was tested
+/// with explicit xart_guard=1; the inherited guard policy is unchanged.
 pub(crate) const T8142: PlatformProfile = PlatformProfile {
-    name: "T8142/J815",
+    name: "T8142/J813, J815",
     sensor: SensorProfile {
         controller_base: 0x3_a510_8000,
         ..T8132.sensor
@@ -725,10 +725,12 @@ mod tests {
 
     #[test]
     fn t8142_sensor_boards_require_the_matching_soc() {
-        let cases: [(&[u8], &[u8], bool); 7] = [
+        assert_eq!(T8142.xart_guard, 1);
+        let cases: [(&[u8], &[u8], bool); 8] = [
             (b"apple,t8142", b"apple,j813", true),
             (b"apple,t8142", b"apple,j815", true),
             (b"apple,t8142", b"apple,j814", false),
+            (b"apple,t8142", b"apple,j704", false),
             (b"apple,t8142", b"", false),
             (b"", b"apple,j813", false),
             (b"apple,t8132", b"apple,j813", false),
@@ -738,7 +740,7 @@ mod tests {
             let has = |c: &[u8]| c == soc || c == board;
             let selected = select(&has, &|| &T6020);
             if admitted {
-                assert!(matches!(selected, Ok(profile) if core::ptr::eq(profile, &T8142)));
+                assert!(matches!(selected, Ok(profile) if profile.name == T8142.name));
             } else {
                 assert!(selected.is_err());
             }
@@ -829,7 +831,7 @@ mod tests {
     /// profile naming one of the known Mesa revisions.
     #[test]
     fn every_touch_id_mac_gets_a_sensor_the_shared_path_decodes() {
-        let macs: [&[&[u8]]; 15] = [
+        let macs: [&[&[u8]]; 17] = [
             &[b"apple,j313", b"apple,t8103"],
             &[b"apple,j316s", b"apple,t6000"],
             &[b"apple,j316c", b"apple,t6001"],
@@ -845,6 +847,8 @@ mod tests {
             &[b"apple,j713", b"apple,t8132"],
             &[b"apple,j700", b"apple,t8140"],
             &[b"apple,j714s", b"apple,t6050"],
+            &[b"apple,j813", b"apple,t8142"],
+            &[b"apple,j815", b"apple,t8142"],
         ];
         for compatibles in macs {
             let has = |c: &[u8]| compatibles.iter().any(|x| *x == c);
@@ -906,6 +910,7 @@ mod dart_window_tests {
             &T6041,
             &T6050,
             &T8132,
+            &T8142,
         ] {
             assert_eq!(offset(profile.dart_window), 1 << 40);
             assert_eq!(range(profile.dart_window), (0, 1 << 32));

From a244cd1d154966e240ce45098ca3f5b131277412 Mon Sep 17 00:00:00 2001
From: Diljit Singh <hey@djdev.me>
Date: Fri, 13 Nov 2026 20:31:10 -0500
Subject: [PATCH 21/21] arm64: dts: apple: enable tested PMU, cache and encoder
 on J813

Apply the board enablement patch supplied by @gig3m, who also reported
hardware results for the J813 M5 MacBook Air. The shared definitions are
already used by J815; enable the PMU, MCC, six VENC power states, both
encoder DARTs and the encoder on J813.

The owner's test used a 27.0 stub, integration 5d112b1d plus the J813/J815
series and Touch ID block, and aura#215 at 63098e74. PMU counts/recording,
four MCC planes, GStreamer H.264/HEVC encodes and one post-s2idle encode
were reported. Existing ffmpeg session refusals remain; concurrent,
camera-source and open-session lid-sleep cases were not tested.

Preserve shared disabled defaults, loader firmware checks, driver guards
and unrelated board state. Only wrap the supplied MCC comment for style.
Source-model checks find exactly eleven status changes and match all
node properties against J815; this is not a new hardware or DTB result.

Patch and hardware report: @gig3m (assisted by Claude Fable 5.2).
Link: https://github.com/aurora-silicon/linux/pull/1532#issuecomment-6869281295
Assisted-by: LLM
Signed-off-by: Diljit Singh <hey@djdev.me>
---
 arch/arm64/boot/dts/apple/t8142-j813.dts | 53 ++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/arch/arm64/boot/dts/apple/t8142-j813.dts b/arch/arm64/boot/dts/apple/t8142-j813.dts
index 94dc523b12d55..8435957851436 100644
--- a/arch/arm64/boot/dts/apple/t8142-j813.dts
+++ b/arch/arm64/boot/dts/apple/t8142-j813.dts
@@ -107,6 +107,10 @@
 	status = "okay";
 };
 
+&cpu_pmu {
+	status = "okay";
+};
+
 &dockchannel {
 	status = "okay";
 };
@@ -183,3 +187,52 @@
 };
 
 /* Unexposed chassis port instances remain described and disabled. */
+
+/*
+ * aura (mcc_init_m5) turns the system level cache on; the driver confirms it
+ * and flushes on shutdown.
+ */
+&mcc {
+	status = "okay";
+};
+
+/*
+ * Video encoder: ADT ave ("ave2", pre-loaded) behind dart-ave, the same
+ * addresses, interrupts and power states as on the J815. aura hands over the
+ * preloaded firmware or disables the node.
+ */
+&ps_venc_sys {
+	status = "okay";
+};
+
+&ps_venc_dma {
+	status = "okay";
+};
+
+&ps_venc_pipe4 {
+	status = "okay";
+};
+
+&ps_venc_pipe5 {
+	status = "okay";
+};
+
+&ps_venc_me0 {
+	status = "okay";
+};
+
+&ps_venc_me1 {
+	status = "okay";
+};
+
+&ave_dart0 {
+	status = "okay";
+};
+
+&ave_dart1 {
+	status = "okay";
+};
+
+&ave {
+	status = "okay";
+};