Commit 035ec292 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'dt-bindings-net-snps-dwmac-remove-tx-sched-sp-property' 

Flavio Suligoi says:

====================
dt-bindings: net: snps, dwmac: remove tx-sched-sp property

Strict priority for the tx scheduler is by default in Linux driver, so the
tx-sched-sp property was removed in commit aed68640 ("net: stmmac:
platform: Delete a redundant condition branch").

This property is still in use in the following DT (and it will be removed
in a separate patch series):

- arch/arm64/boot/dts/freescale/imx8mp-beacon-som.dtsi
- arch/arm64/boot/dts/freescale/imx8mp-evk.dts
- arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi
- arch/arm64/boot/dts/qcom/sa8540p-ride.dts
- arch/arm64/boot/dts/qcom/sa8775p-ride.dts

There is no problem if that property is still used in the DTs above,
since, as seen above, it is a default property of the driver.
====================

Link: https://lore.kernel.org/r/20240429092654.31390-1-f.suligoi@asem.it


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents e7b1b078 a2af4929

Documentation/devicetree/bindings/net/snps,dwmac.yaml

+0 −14
Original line number Diff line number Diff line
@@ -328,9 +328,6 @@ properties: 
      snps,tx-sched-dwrr:

        type: boolean

        description: Deficit Weighted Round Robin

      snps,tx-sched-sp:

        type: boolean

        description: Strict priority

    allOf:

      - if:

          required:
@@ -339,7 +336,6 @@ properties: 
          properties:

            snps,tx-sched-wfq: false

            snps,tx-sched-dwrr: false

            snps,tx-sched-sp: false

      - if:

          required:

            - snps,tx-sched-wfq
@@ -347,7 +343,6 @@ properties: 
          properties:

            snps,tx-sched-wrr: false

            snps,tx-sched-dwrr: false

            snps,tx-sched-sp: false

      - if:

          required:

            - snps,tx-sched-dwrr
@@ -355,15 +350,6 @@ properties: 
          properties:

            snps,tx-sched-wrr: false

            snps,tx-sched-wfq: false

            snps,tx-sched-sp: false

      - if:

          required:

            - snps,tx-sched-sp

        then:

          properties:

            snps,tx-sched-wrr: false

            snps,tx-sched-wfq: false

            snps,tx-sched-dwrr: false

    patternProperties:

      "^queue[0-9]$":

        description: Each subnode represents a queue.