Return stale aurora-wip leftovers to integration/aurora

Documentation/devicetree/bindings/display/apple,dcp.yaml

@@ -35,7 +35,6 @@ properties:
               - apple,t6020-dcpext
               - apple,t6041-dcpext
           - const: apple,dcpext
-      - const: apple,t6041-dcpext
       - items:
           - const: apple,t8140-dcpext
           - const: apple,dcp
@@ -295,8 +294,6 @@ properties:
   '#size-cells':
     const: 2
 
-  ranges: true
-
   piodma:
     type: object
     properties:
@@ -393,19 +390,10 @@ allOf:
             pattern: '^(dp-xbar|typec[0-9]+)$'
   - if:
       not:
-        anyOf:
-          - properties:
-              compatible:
-                contains:
-                  const: apple,t8132-dcp
-          - properties:
-              compatible:
-                contains:
-                  const: apple,t6041-dcpext
-              status:
-                const: disabled
-            required:
-              - status
+        properties:
+          compatible:
+            contains:
+              const: apple,t8132-dcp
     then:
       required:
         - apple,bw-scratch

Documentation/devicetree/bindings/phy/apple,t6040-atcphy.yaml

@@ -106,8 +106,8 @@ properties:
   port:
     $ref: /schemas/graph.yaml#/properties/port
     description: >
-      Link to the SuperSpeed lanes of the Type-C connector, or to the DCP
-      DisplayPort output on a fixed DisplayPort PHY.
+      Link to the SuperSpeed lanes of the Type-C connector. Absent on a fixed
+      DisplayPort PHY.
 
   apple,tunable-axi2af:
     $ref: "#/$defs/apple,tunable"
@@ -174,6 +174,7 @@ allOf:
         "#reset-cells": false
         orientation-switch: false
         mode-switch: false
+        port: false
 
 additionalProperties: false
 

Documentation/devicetree/bindings/sound/apple,t6030-dpaudio.yaml

@@ -4,36 +4,29 @@
 $id: http://devicetree.org/schemas/sound/apple,t6030-dpaudio.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Apple T6030 and T6041 DisplayPort audio
+title: Apple T6030 DisplayPort audio
 
 maintainers:
   - Ryan Murray <ryan@aurorasilicon.org>
 
 description: |
-  Each DisplayPort audio interface has no application-processor registers.
-  Samples arrive through SIO, and the graph connects the interface to port 0
-  of the display processor that owns its audio service. An interface without
-  an assigned display processor has no graph connection and remains disabled.
-
-  T6041 requires a generation-specific SIO firmware backend and a compatible
-  display audio service before these interfaces can be enabled.
+  The external display processor provides the HDMI port's audio service.
+  Its DisplayPort audio interface has no application-processor registers.
+  Samples arrive through SIO, and the graph connects this interface to
+  port 0 of the display processor that owns the audio service.
 
 select:
   properties:
     compatible:
       contains:
-        enum:
-          - apple,t6030-dpaudio
-          - apple,t6041-dpaudio
+        const: apple,t6030-dpaudio
   required:
     - compatible
 
 properties:
   compatible:
     items:
-      - enum:
-          - apple,t6030-dpaudio
-          - apple,t6041-dpaudio
+      - const: apple,t6030-dpaudio
       - const: apple,dpaudio
 
   dmas:
@@ -59,26 +52,6 @@ required:
   - dmas
   - dma-names
   - power-domains
-
-allOf:
-  - if:
-      properties:
-        compatible:
-          contains:
-            const: apple,t6030-dpaudio
-    then:
-      required:
-        - ports
-
-  - if:
-      not:
-        required:
-          - ports
-    then:
-      properties:
-        status:
-          const: disabled
-      required:
-        - status
+  - ports
 
 additionalProperties: false

MAINTAINERS

@@ -2110,7 +2110,6 @@ F:	Documentation/devicetree/bindings/sound/apple,t8140-aop-audio.yaml
 F:	Documentation/devicetree/bindings/usb/vialab,vl122.yaml
 F:	Documentation/gpu/apple-dcp-backlight.rst
 F:	Documentation/hid/apple-j700-multitouch.rst
-F:	Documentation/soc/apple/t8140-pmp-dvfs.rst
 F:	Documentation/networking/device_drivers/wifi/mt7932-neo.rst
 F:	arch/arm64/boot/dts/apple/t8140*
 F:	arch/arm64/configs/j700*.config
@@ -2809,13 +2808,6 @@ S:	Maintained
 F:	Documentation/devicetree/bindings/spi/apple,qspi.yaml
 F:	drivers/spi/spi-apple-qspi.c
 
-ARM/APPLE QSPIMC DRIVER
-M:	Ryan Murray <ryan@aurorasilicon.org>
-W:	https://aurora-silicon.github.io
-S:	Maintained
-F:	Documentation/devicetree/bindings/spi/apple,qspi.yaml
-F:	drivers/spi/spi-apple-qspi.c
-
 ARM/ARTPEC MACHINE SUPPORT
 M:	Jesper Nilsson <jesper.nilsson@axis.com>
 M:	Lars Persson <lars.persson@axis.com>