PCI: apple: draft T6040 USB4 tunnel resources

Documentation/devicetree/bindings/pci/apple,pcie.yaml

@@ -78,6 +78,7 @@ properties:
           - const: apple,t8132-pciec
           - const: apple,t8122-pciec
           - const: apple,t8103-pciec
+      - const: apple,t6040-pciec
 
   apple,managed-sids:
     $ref: /schemas/types.yaml#/definitions/uint32-array
@@ -110,7 +111,11 @@ properties:
     description:
       Interrupt specifiers, one for each root port.
     minItems: 1
-    maxItems: 4
+    maxItems: 6
+
+  interrupt-names:
+    minItems: 1
+    maxItems: 6
 
   msi-parent: true
 
@@ -211,7 +216,9 @@ allOf:
       properties:
         compatible:
           contains:
-            const: apple,t8132-pciec
+            enum:
+              - apple,t8132-pciec
+              - apple,t6040-pciec
     then:
       required:
         - apple,msi-vector-base
@@ -255,6 +262,7 @@ allOf:
             enum:
               - apple,t8103-pciec
               - apple,t6000-pciec
+              - apple,t6040-pciec
     then:
       properties:
         reg:
@@ -286,11 +294,49 @@ allOf:
                 - const: ltssm
                 - const: intr2axi
                 - const: oe-fabric
+            - items:
+                - const: config
+                - const: rc
+                - const: port0
+                - const: fabric
+                - const: debug
+                - const: ioa
+                - const: ltssm
+                - const: intr2axi
         interrupts:
-          maxItems: 1
+          maxItems: 6
         ranges:
           minItems: 3
           maxItems: 3
+      allOf:
+        - if:
+            properties:
+              compatible:
+                contains:
+                  const: apple,t6040-pciec
+          then:
+            properties:
+              reg:
+                minItems: 8
+                maxItems: 8
+              interrupts:
+                minItems: 6
+                maxItems: 6
+              interrupt-names:
+                items:
+                  - const: port
+                  - const: intx-a
+                  - const: intx-b
+                  - const: intx-c
+                  - const: intx-d
+                  - const: parity
+            required:
+              - interrupt-names
+          else:
+            properties:
+              interrupts:
+                maxItems: 1
+              interrupt-names: false
     else:
       properties:
         resets: false

Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-acio.yaml

@@ -17,8 +17,8 @@ description: |
 
   The co-processor exposes the Native Host Interface (NHI) and its DART IOMMU
   to the main SoC bus once it is running. They are therefore represented as
-  child nodes. All child registers are located in a single 16 MiB MMIO window
-  and use addresses relative to this window.
+  child nodes. All child registers use addresses relative to the router's MMIO
+  window. Type 7 expands that window and shifts its child offsets by 16 MiB.
 
   ACIO can only be powered on after the Type-C PHY has been switched to
   USB4/Thunderbolt mode. Before the connection to the remote device can be
@@ -30,6 +30,7 @@ properties:
     oneOf:
       - const: apple,t8103-usb4-acio
       - const: apple,t8142-usb4-acio
+      - const: apple,t6040-usb4-acio
       - items:
           - enum:
               - apple,t6000-usb4-acio
@@ -50,7 +51,7 @@ properties:
           PCIe adapter configuration space of the USB4 router. Present where
           the root complex exposes the adapter separately, so that the tunnel
           can be configured before a PCIe-C link is brought up.
-      - description: MxWrap co-processor control registers, on T8132
+      - description: MxWrap co-processor control registers
 
   reg-names:
     minItems: 2
@@ -60,6 +61,14 @@ properties:
       - const: pcie-adapter
       - const: cpu
 
+  interrupts:
+    maxItems: 1
+    description: Type 7 SRAM parity interrupt
+
+  interrupt-names:
+    items:
+      - const: sram-parity
+
   mboxes:
     maxItems: 1
     description: Mailbox used for RTKit communication with the co-processor
@@ -161,11 +170,12 @@ properties:
     required:
       - port@1
 
-  iommu@a80000:
+patternProperties:
+  "^iommu@(a80000|1a80000)$":
     $ref: /schemas/iommu/apple,dart.yaml#
     description: DART IOMMU exposed by ACIO and used for DMA from the NHI
 
-  nhi@f00000:
+  "^nhi@(f00000|1f00000)$":
     $ref: /schemas/thunderbolt/apple,t8103-usb4-nhi.yaml#
     description: Native Host Interface exposed by ACIO
 
@@ -182,8 +192,6 @@ required:
   - ranges
   - nonposted-mmio
   - ports
-  - iommu@a80000
-  - nhi@f00000
 
 allOf:
   - $ref: /schemas/usb/usb-switch.yaml#
@@ -204,6 +212,21 @@ allOf:
     else:
       properties:
         lstx-gpios: false
+  - if:
+      properties:
+        compatible:
+          contains:
+            const: apple,t6040-usb4-acio
+    then:
+      required:
+        - iommu@1a80000
+        - nhi@1f00000
+        - interrupts
+        - interrupt-names
+    else:
+      required:
+        - iommu@a80000
+        - nhi@f00000
 
 additionalProperties: false
 

Documentation/devicetree/bindings/thunderbolt/apple,t8103-usb4-nhi.yaml

@@ -22,6 +22,7 @@ properties:
     oneOf:
       - const: apple,t8103-usb4-nhi
       - const: apple,t8142-usb4-nhi
+      - const: apple,t6040-usb4-nhi
       - items:
           - enum:
               - apple,t6000-usb4-nhi
@@ -124,7 +125,9 @@ allOf:
       properties:
         compatible:
           contains:
-            const: apple,t8142-usb4-nhi
+            enum:
+              - apple,t8142-usb4-nhi
+              - apple,t6040-usb4-nhi
     then:
       properties:
         reg:
@@ -147,6 +150,7 @@ allOf:
               - apple,t8122-usb4-nhi
               - apple,t8132-usb4-nhi
               - apple,t8142-usb4-nhi
+              - apple,t6040-usb4-nhi
     then:
       properties:
         iommus: