Merge branch 'kbuild-6.19.fms.extension'

Bring in the shared branch with the kbuild tree to enable '-fms-extensions' for 6.19. Further namespace cleanup work requires this extension. Signed-off-by: Christian Brauner <brauner@kernel.org>
2026-08-13 14:19:53 -07:00 · 2025-11-11 09:59:08 +01:00
parent ae901e5e2e 3c60b0b1e5
commit a67ee4e2ba
269 changed files with 2613 additions and 1568 deletions
@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk>
 Alan Cox <root@hraefn.swansea.linux.org.uk>
 Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
 Aleksey Gorelov <aleksey_gorelov@phoenix.com>
+Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>
 Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
 Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
 Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>
@@ -142,7 +142,9 @@ allOf:
      required:
        - orientation-switch
    then:
-      $ref: /schemas/usb/usb-switch.yaml#
+      allOf:
+        - $ref: /schemas/usb/usb-switch.yaml#
+        - $ref: /schemas/usb/usb-switch-ports.yaml#

 unevaluatedProperties: false

@@ -24,6 +24,10 @@ properties:
          - enum:
              - qcom,qcs8300-qmp-ufs-phy
          - const: qcom,sa8775p-qmp-ufs-phy
+      - items:
+          - enum:
+              - qcom,kaanapali-qmp-ufs-phy
+          - const: qcom,sm8750-qmp-ufs-phy
      - enum:
          - qcom,msm8996-qmp-ufs-phy
          - qcom,msm8998-qmp-ufs-phy
@@ -125,7 +125,9 @@ allOf:
          contains:
            const: google,gs101-usb31drd-phy
    then:
-      $ref: /schemas/usb/usb-switch.yaml#
+      allOf:
+        - $ref: /schemas/usb/usb-switch.yaml#
+        - $ref: /schemas/usb/usb-switch-ports.yaml#

      properties:
        clocks:
@@ -197,6 +197,7 @@ allOf:
              - renesas,rcar-gen2-scif
              - renesas,rcar-gen3-scif
              - renesas,rcar-gen4-scif
+              - renesas,rcar-gen5-scif
    then:
      properties:
        interrupts:
@@ -14,9 +14,14 @@ allOf:

 properties:
  compatible:
-    enum:
-      - cdns,spi-r1p6
-      - xlnx,zynq-spi-r1p6
+    oneOf:
+      - enum:
+          - xlnx,zynq-spi-r1p6
+      - items:
+          - enum:
+              - xlnx,zynqmp-spi-r1p6
+              - xlnx,versal-net-spi-r1p6
+          - const: cdns,spi-r1p6

  reg:
    maxItems: 1
@@ -34,6 +34,7 @@ properties:
              - rockchip,rk3328-spi
              - rockchip,rk3368-spi
              - rockchip,rk3399-spi
+              - rockchip,rk3506-spi
              - rockchip,rk3528-spi
              - rockchip,rk3562-spi
              - rockchip,rk3568-spi
@@ -15,6 +15,7 @@ select:
    compatible:
      contains:
        enum:
+          - qcom,kaanapali-ufshc
          - qcom,sm8650-ufshc
          - qcom,sm8750-ufshc
  required:
@@ -24,6 +25,7 @@ properties:
  compatible:
    items:
      - enum:
+          - qcom,kaanapali-ufshc
          - qcom,sm8650-ufshc
          - qcom,sm8750-ufshc
      - const: qcom,ufshc
@@ -76,6 +76,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -89,13 +89,21 @@ required:
  - reg
  - "#address-cells"
  - "#size-cells"
-  - dma-ranges
  - ranges
  - clocks
  - clock-names
  - interrupts
  - power-domains

+allOf:
+  - if:
+      properties:
+        compatible:
+          const: fsl,imx8mp-dwc3
+    then:
+      required:
+        - dma-ranges
+
 additionalProperties: false

 examples:
@@ -52,6 +52,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#
  - if:
      required:
        - mode-switch
@@ -46,6 +46,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -91,6 +91,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -81,6 +81,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -68,6 +68,7 @@ properties:
          - qcom,sm8550-dwc3
          - qcom,sm8650-dwc3
          - qcom,x1e80100-dwc3
+          - qcom,x1e80100-dwc3-mp
      - const: qcom,snps-dwc3

  reg:
@@ -460,8 +461,10 @@ allOf:
    then:
      properties:
        interrupts:
+          minItems: 4
          maxItems: 5
        interrupt-names:
+          minItems: 4
          items:
            - const: dwc_usb3
            - const: pwr_event
@@ -60,6 +60,7 @@ required:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 additionalProperties: false

@@ -11,6 +11,7 @@ maintainers:

 allOf:
  - $ref: usb-switch.yaml#
+  - $ref: usb-switch-ports.yaml#

 properties:
  compatible:
@@ -0,0 +1,68 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/usb/usb-switch-ports.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: USB Orientation and Mode Switches Ports Graph Properties
+
+maintainers:
+  - Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+description:
+  Ports Graph properties for devices handling USB mode and orientation switching.
+
+properties:
+  port:
+    $ref: /schemas/graph.yaml#/$defs/port-base
+    description:
+      A port node to link the device to a TypeC controller for the purpose of
+      handling altmode muxing and orientation switching.
+
+    properties:
+      endpoint:
+        $ref: /schemas/graph.yaml#/$defs/endpoint-base
+        unevaluatedProperties: false
+        properties:
+          data-lanes:
+            $ref: /schemas/types.yaml#/definitions/uint32-array
+            minItems: 1
+            maxItems: 8
+            uniqueItems: true
+            items:
+              maximum: 8
+
+  ports:
+    $ref: /schemas/graph.yaml#/properties/ports
+    properties:
+      port@0:
+        $ref: /schemas/graph.yaml#/properties/port
+        description:
+          Super Speed (SS) Output endpoint to the Type-C connector
+
+      port@1:
+        $ref: /schemas/graph.yaml#/$defs/port-base
+        description:
+          Super Speed (SS) Input endpoint from the Super-Speed PHY
+        unevaluatedProperties: false
+
+        properties:
+          endpoint:
+            $ref: /schemas/graph.yaml#/$defs/endpoint-base
+            unevaluatedProperties: false
+            properties:
+              data-lanes:
+                $ref: /schemas/types.yaml#/definitions/uint32-array
+                minItems: 1
+                maxItems: 8
+                uniqueItems: true
+                items:
+                  maximum: 8
+
+oneOf:
+  - required:
+      - port
+  - required:
+      - ports
+
+additionalProperties: true
@@ -25,56 +25,4 @@ properties:
    description: Possible handler of SuperSpeed signals retiming
    type: boolean

-  port:
-    $ref: /schemas/graph.yaml#/$defs/port-base
-    description:
-      A port node to link the device to a TypeC controller for the purpose of
-      handling altmode muxing and orientation switching.
-
-    properties:
-      endpoint:
-        $ref: /schemas/graph.yaml#/$defs/endpoint-base
-        unevaluatedProperties: false
-        properties:
-          data-lanes:
-            $ref: /schemas/types.yaml#/definitions/uint32-array
-            minItems: 1
-            maxItems: 8
-            uniqueItems: true
-            items:
-              maximum: 8
-
-  ports:
-    $ref: /schemas/graph.yaml#/properties/ports
-    properties:
-      port@0:
-        $ref: /schemas/graph.yaml#/properties/port
-        description:
-          Super Speed (SS) Output endpoint to the Type-C connector
-
-      port@1:
-        $ref: /schemas/graph.yaml#/$defs/port-base
-        description:
-          Super Speed (SS) Input endpoint from the Super-Speed PHY
-        unevaluatedProperties: false
-
-        properties:
-          endpoint:
-            $ref: /schemas/graph.yaml#/$defs/endpoint-base
-            unevaluatedProperties: false
-            properties:
-              data-lanes:
-                $ref: /schemas/types.yaml#/definitions/uint32-array
-                minItems: 1
-                maxItems: 8
-                uniqueItems: true
-                items:
-                  maximum: 8
-
-oneOf:
-  - required:
-      - port
-  - required:
-      - ports
-
 additionalProperties: true
@@ -11,6 +11,7 @@ found on https://linux-ax25.in-berlin.de.

 There is a mailing list for discussing Linux amateur radio matters
 called linux-hams@vger.kernel.org. To subscribe to it, send a message to
-majordomo@vger.kernel.org with the words "subscribe linux-hams" in the body
-of the message, the subject field is ignored.  You don't need to be
-subscribed to post but of course that means you might miss an answer.
+linux-hams+subscribe@vger.kernel.org or use the web interface at
+https://vger.kernel.org. The subject and body of the message are
+ignored.  You don't need to be subscribed to post but of course that
+means you might miss an answer.
--- a/Show More
+++ b/Show More