Commit f2cdc4c2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 



Cross-merge networking fixes after downstream PR (net-6.17-rc7).

No conflicts.

Adjacent changes:

drivers/net/ethernet/mellanox/mlx5/core/en/fs.h
  9536fbe1 ("net/mlx5e: Add PSP steering in local NIC RX")
  7601a0a4 ("net/mlx5e: Add a miss level for ipsec crypto offload")

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 1d977083 cbf658dd

Documentation/devicetree/bindings/dma/qcom,bam-dma.yaml

+4 −0
Original line number Diff line number Diff line
@@ -92,8 +92,12 @@ required: 
anyOf:

  - required:

      - qcom,powered-remotely

      - num-channels

      - qcom,num-ees

  - required:

      - qcom,controlled-remotely

      - num-channels

      - qcom,num-ees

  - required:

      - clocks

      - clock-names

Documentation/devicetree/bindings/phy/marvell,comphy-cp110.yaml

+21 −8
Original line number Diff line number Diff line
@@ -47,21 +47,19 @@ properties: 
    const: 0



  clocks:

    minItems: 1

    maxItems: 3

    description: Reference clocks for CP110; MG clock, MG Core clock, AXI clock



  clock-names:

    items:

      - const: mg_clk

      - const: mg_core_clk

      - const: axi_clk

    minItems: 1

    maxItems: 3



  marvell,system-controller:

    description: Phandle to the Marvell system controller (CP110 only)

    $ref: /schemas/types.yaml#/definitions/phandle



patternProperties:

  '^phy@[0-2]$':

  '^phy@[0-5]$':

    description: A COMPHY lane child node

    type: object

    additionalProperties: false
@@ -69,10 +67,14 @@ patternProperties: 
    properties:

      reg:

        description: COMPHY lane number

        maximum: 5



      '#phy-cells':

        const: 1



      connector:

        type: object



    required:

      - reg

      - '#phy-cells'
@@ -91,13 +93,24 @@ allOf: 


    then:

      properties:

        clocks: false

        clock-names: false

        clocks:

          maxItems: 1

        clock-names:

          const: xtal



      required:

        - reg-names



    else:

      properties:

        clocks:

          minItems: 3

        clock-names:

          items:

            - const: mg_clk

            - const: mg_core_clk

            - const: axi_clk



      required:

        - marvell,system-controller

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml

+2 −2
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,sa8775p-qmp-gen4x2-pcie-phy

              - qcom,sa8775p-qmp-gen4x4-pcie-phy

              - qcom,sc8280xp-qmp-gen3x1-pcie-phy

              - qcom,sc8280xp-qmp-gen3x2-pcie-phy

              - qcom,sc8280xp-qmp-gen3x4-pcie-phy
@@ -197,8 +199,6 @@ allOf: 
          contains:

            enum:

              - qcom,qcs8300-qmp-gen4x2-pcie-phy

              - qcom,sa8775p-qmp-gen4x2-pcie-phy

              - qcom,sa8775p-qmp-gen4x4-pcie-phy

    then:

      properties:

        clocks:

Documentation/devicetree/bindings/serial/8250.yaml

+31 −25
Original line number Diff line number Diff line
@@ -48,7 +48,6 @@ allOf: 
      oneOf:

        - required: [ clock-frequency ]

        - required: [ clocks ]



  - if:

      properties:

        compatible:
@@ -60,12 +59,39 @@ allOf: 
          items:

            - const: uartclk

            - const: reg

    else:

  - if:

      properties:

        compatible:

          contains:

            const: spacemit,k1-uart

    then:

      properties:

        clock-names:

          items:

            - const: core

            - const: bus

  - if:

      properties:

        compatible:

          contains:

            enum:

              - spacemit,k1-uart

              - nxp,lpc1850-uart

    then:

      required:

        - clocks

        - clock-names

      properties:

        clocks:

          minItems: 2

        clock-names:

          minItems: 2

    else:

      properties:

        clocks:

          maxItems: 1

        clock-names:

          maxItems: 1



properties:

  compatible:
@@ -162,6 +188,9 @@ properties: 
    minItems: 1

    maxItems: 2

    oneOf:

      - enum:

          - main

          - uart

      - items:

          - const: core

          - const: bus
@@ -264,29 +293,6 @@ required: 
  - reg

  - interrupts



if:

  properties:

    compatible:

      contains:

        enum:

          - spacemit,k1-uart

          - nxp,lpc1850-uart

then:

  required:

    - clocks

    - clock-names

  properties:

    clocks:

      minItems: 2

    clock-names:

      minItems: 2

else:

  properties:

    clocks:

      maxItems: 1

    clock-names:

      maxItems: 1



unevaluatedProperties: false



examples:

Documentation/devicetree/bindings/serial/brcm,bcm7271-uart.yaml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ properties: 
          - const: dma_intr2



  clocks:

    minItems: 1

    maxItems: 1



  clock-names:

    const: sw_baud