J616s consolidation: batch5 kernel on the current integration/aurora

Documentation/devicetree/bindings/dma/apple,sio.yaml

@@ -19,12 +19,15 @@ allOf:
 
 properties:
   compatible:
-    items:
-      - enum:
-          - apple,t6000-sio
-          - apple,t6030-sio
-          - apple,t8103-sio
-      - const: apple,sio
+    oneOf:
+      - items:
+          - enum:
+              - apple,t6000-sio
+              - apple,t6030-sio
+              - apple,t8103-sio
+          - const: apple,sio
+      - description: T6041 firmware requires a generation-specific backend.
+        const: apple,t6041-sio
 
   reg:
     maxItems: 1

Documentation/devicetree/bindings/gpu/apple,agx.yaml

@@ -72,6 +72,22 @@ properties:
       - enum: [hw-cal-b, fw-text, l2-pagetables]
       - enum: [globals, fw-data, fw-text]
 
+  apple,clpc:
+    $ref: /schemas/types.yaml#/definitions/phandle
+    description: |
+      Host performance controller receiving GPU submission and idle demand.
+      GFX supplier power cannot represent GPU work on firmware that keeps
+      its coprocessor domain powered while the cores are idle.
+
+  apple,idle-off-delay-ms:
+    minimum: 2
+    maximum: 1000
+    default: 2
+    description:
+      Continuous idle time before GPU power-off, in milliseconds. The G17
+      backend extends the firmware's native delay with its host idle-hold
+      control; an absent property preserves the native policy.
+
   apple,pmp:
     $ref: /schemas/types.yaml#/definitions/phandle
     description: PMP firmware provider owning the GPU power vote and telemetry
@@ -83,9 +99,9 @@ properties:
     minItems: 3
     maxItems: 3
     description:
-      macOS version (major, minor, patch) whose boot firmware loaded the GPU
-      firmware, which identifies the firmware build. Filled in by the boot
-      loader.
+      Reported macOS version (major, minor, patch) whose boot firmware loaded
+      the GPU firmware. Filled in by the boot loader. This is a selection
+      hint; the T6040 driver requires the exact loaded image identity.
 
   apple,cs-opp:
     $ref: /schemas/types.yaml#/definitions/phandle
@@ -99,6 +115,75 @@ properties:
       Operating-point table of the GPU's AFR clock domain, one voltage cell
       per state.
 
+  apple,t6040-handoff-version:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    const: 2
+    description:
+      Written last by the boot loader after it has filled the T6040 operating
+      points, memory regions and per-chip calibration. Absent in the source DT.
+
+  apple,core-mask:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: Enabled cores in the two ten-core T6040 clusters, low cluster first
+
+  apple,max-power-mw:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description: Per-chip maximum GPU power in milliwatts, calculated by the loader
+
+  apple,perf-base-pstate:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    description:
+      Logical base state of the frequency-relative performance table. T6040
+      supports the first active state, also used when its ADT omits the property.
+
+  apple,perf-map-a:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      All 16 A selector register fields, indexing raw ADT operating points.
+      Eleven populated entries, including off, followed by five zeros.
+
+  apple,perf-map-b:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      All 16 B selector register fields, indexing raw ADT operating points.
+      Eleven populated entries, including off, followed by five zeros.
+
+  apple,perf-relative-a:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      Per-chip relative power of each populated A selector, in percent,
+      followed by zeros for the five unused selectors.
+
+  apple,perf-relative-b:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      Relative frequency of the populated A ladder above the base state,
+      in percent, followed by zeros for the five unused selectors.
+
+  apple,core-leak-coef:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      GPU core leakage, one coefficient per cluster. Per-chip efuse values decoded by the boot loader,
+      stored as IEEE-754 binary32 bit patterns in big-endian cells.
+
+  apple,sram-leak-coef:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      GPU SRAM leakage, one coefficient per cluster. Per-chip efuse values decoded by the boot loader,
+      stored as IEEE-754 binary32 bit patterns in big-endian cells.
+
+  apple,cs-leak-coef:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      CS leakage. Per-chip efuse values decoded by the boot loader,
+      stored as IEEE-754 binary32 bit patterns in big-endian cells.
+
+  apple,afr-leak-coef:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      AFR leakage. Per-chip efuse values decoded by the boot loader,
+      stored as IEEE-754 binary32 bit patterns in big-endian cells.
+
   apple,firmware-abi:
     $ref: /schemas/types.yaml#/definitions/uint32-array
     minItems: 3
@@ -190,6 +275,38 @@ allOf:
             const: apple,agx-t6040
     then:
       properties:
+        apple,core-mask:
+          minimum: 1
+          maximum: 1048575
+        apple,max-power-mw:
+          minimum: 1
+          maximum: 200000
+        apple,perf-base-pstate:
+          const: 1
+        apple,perf-map-a:
+          minItems: 16
+          maxItems: 16
+        apple,perf-map-b:
+          minItems: 16
+          maxItems: 16
+        apple,perf-relative-a:
+          minItems: 16
+          maxItems: 16
+        apple,perf-relative-b:
+          minItems: 16
+          maxItems: 16
+        apple,core-leak-coef:
+          minItems: 2
+          maxItems: 2
+        apple,sram-leak-coef:
+          minItems: 2
+          maxItems: 2
+        apple,cs-leak-coef:
+          minItems: 1
+          maxItems: 1
+        apple,afr-leak-coef:
+          minItems: 1
+          maxItems: 1
         reg:
           items:
             - description: GFX coprocessor control registers

Documentation/devicetree/bindings/input/apple,mesa-fingerprint.yaml

@@ -57,11 +57,17 @@ properties:
     description: Rail selector words, in power-on order.
 
   firmware-name:
-    maxItems: 1
+    minItems: 1
+    items:
+      - description:
+          Calibration blob for this sensor.
+      - description:
+          Signed root-key container, for sensors whose enclave session needs
+          one.
     description:
-      Calibration blob for this sensor.  It is per-device factory data written
-      at manufacture, so it is neither redistributable nor derivable from the
-      compatible; the board description has to name it.
+      Per-device factory data written at manufacture, so neither
+      redistributable nor derivable from the compatible; the board
+      description has to name it.
 
   spi-cpha: true
 

Documentation/devicetree/bindings/media/apple,t8140-ave.yaml

@@ -4,19 +4,21 @@
 $id: http://devicetree.org/schemas/media/apple,t8140-ave.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Apple T8140 video encoder
+title: Apple video encoder
 
 maintainers:
   - Miguel Cruz <7362641+Acelogic@users.noreply.github.com>
 
 description: |
-  The T8140 AVE coprocessor encodes video using firmware preloaded by the
+  The T6041 and T8140 AVE coprocessors encode video using firmware preloaded by the
   bootloader. Its two DART instances translate the same stream. The
   bootloader supplies two reserved firmware regions and their IOVA mappings.
 
 properties:
   compatible:
-    const: apple,t8140-ave
+    enum:
+      - apple,t6041-ave
+      - apple,t8140-ave
 
   reg:
     items:

Documentation/devicetree/bindings/net/wireless/brcm,bcm4329-fmac.yaml

@@ -46,6 +46,7 @@ properties:
               - cypress,cyw4373-fmac
               - cypress,cyw43012-fmac
               - infineon,cyw43439-fmac
+              - pci14e4,4434  # BCM4388
           - const: brcm,bcm4329-fmac
       - enum:
           - brcm,bcm4329-fmac

Documentation/devicetree/bindings/npu/apple,ane.yaml

@@ -15,7 +15,9 @@ description:
   drives the engine through its register window. On T602x and T8112 a
   coprocessor runs the ANE firmware and the host talks to it through an ASC
   mailbox. T8140 has two interrupts and one system power domain; its
-  coprocessor uses a different firmware interface.
+  coprocessor uses a different firmware interface. T6041 likewise needs a
+  generation-specific firmware backend; it has one interrupt and its CPU
+  power state supplies the engine through the ANE system domain.
 
 properties:
   compatible:
@@ -25,6 +27,7 @@ properties:
       - apple,t6020-ane
       - apple,t6021-ane
       - apple,t6022-ane
+      - apple,t6041-ane
       - apple,t8112-ane
       - apple,t8140-ane
 
@@ -87,19 +90,35 @@ required:
   - power-domains
 
 allOf:
+  - if:
+      properties:
+        compatible:
+          const: apple,t8140-ane
+    then:
+      properties:
+        interrupts:
+          minItems: 2
+  - if:
+      properties:
+        compatible:
+          const: apple,t6041-ane
+    then:
+      properties:
+        interrupts:
+          maxItems: 1
   - if:
       properties:
         compatible:
           contains:
-            const: apple,t8140-ane
+            enum:
+              - apple,t8140-ane
+              - apple,t6041-ane
     then:
       properties:
         reg:
           maxItems: 1
         reg-names:
           maxItems: 1
-        interrupts:
-          minItems: 2
         interrupt-names: false
         iommus:
           minItems: 3

Documentation/devicetree/bindings/sound/apple,macaudio.yaml

@@ -36,6 +36,15 @@ properties:
       Model name for presentation to users
     $ref: /schemas/types.yaml#/definitions/string
 
+  speaker-id-gpios:
+    minItems: 1
+    maxItems: 8
+    description:
+      Inputs encoding the fitted speaker assembly variant, least significant
+      bit first. The machine driver exposes their logical levels through the
+      read-only Speaker Variant ID control. GPIO polarity flags define each
+      bit's logical level.
+
 patternProperties:
   "^dai-link(@[0-9a-f]+)?$":
     description: |

Documentation/devicetree/bindings/spi/apple,qspi.yaml

@@ -22,6 +22,7 @@ properties:
     enum:
       - apple,t8122-qspi
       - apple,t8132-qspi
+      - apple,t6041-qspi
       - apple,t8140-qspi
 
   reg:

Documentation/devicetree/bindings/spi/apple,spi.yaml

@@ -18,6 +18,7 @@ properties:
       - items:
           - enum:
               - apple,t6020-spi
+              - apple,t6041-spi
               - apple,t8140-spi
           - const: apple,t8103-spi
       - items: