arm64/sep: describe J813 Touch ID and admit its T8142 profile

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-g17c
           - const: apple,agx-g17s
@@ -83,16 +84,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
-    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: 7
 
   apple,clpc:
     $ref: /schemas/types.yaml#/definitions/phandle
@@ -535,6 +531,7 @@ allOf:
                 - apple,agx-t6050
                 - apple,agx-t8132
                 - apple,agx-t8140
+                - apple,agx-t8142
     then:
       properties:
         reg:
@@ -560,6 +557,64 @@ 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
+            - description: Combined firmware data and shared read-only crash logs
+        memory-region-names:
+          items:
+            - const: ttbs
+            - const: pagetables
+            - const: handoff
+            - const: shared-l2
+            - const: gfx-data
+            - const: gfx1-data
+            - const: fw-data
+      required:
+        - reg-names
+        - mboxes
+        - memory-region
+        - memory-region-names
+        - power-domains
+        - operating-points-v2
+    else:
+      properties:
+        memory-region:
+          maxItems: 6
+        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:

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:

Documentation/devicetree/bindings/iio/light/apple,aop-als.yaml

@@ -22,6 +22,7 @@ select:
           - apple,t6020-aop-als
           - apple,t6050-aop-als
           - apple,t8112-aop-als
+          - apple,t8142-aop-als
   required:
     - compatible
 
@@ -32,6 +33,7 @@ properties:
           - apple,t6020-aop-als
           - apple,t6050-aop-als
           - apple,t8112-aop-als
+          - apple,t8142-aop-als
       - const: apple,aop-als
 
 required:

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

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

Documentation/devicetree/bindings/soc/apple/apple,t8152-aop.yaml

@@ -75,6 +75,29 @@ properties:
     description: The lid angle sensor service.
     unevaluatedProperties: false
 
+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:
+          properties:
+            compatible:
+              not:
+                contains:
+                  const: apple,t8142-aop-als
+
 required:
   - compatible
   - reg

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:

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";
+};

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";
 };

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>;
@@ -114,6 +97,16 @@
 	};
 };
 
+&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";
+};
+
 / {
 	/*
 	 * The DCP firmware's clocks 585 and 431 (/arm-io/disp0 clock-ids). The

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";
 };