.../devicetree/bindings/net/mediatek,net.yaml | 28 +++++--- .../devicetree/bindings/net/snps,dwmac.yaml | 67 ++++++++++--------- 2 files changed, 52 insertions(+), 43 deletions(-)
Convention is DT schemas should define all properties at the top-level
and not inside of if/then schemas. That minimizes the if/then schemas
and is more future proof.
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
v2:
- Drop the parts already applied from Serge
---
.../devicetree/bindings/net/mediatek,net.yaml | 28 +++++---
.../devicetree/bindings/net/snps,dwmac.yaml | 67 ++++++++++---------
2 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/mediatek,net.yaml b/Documentation/devicetree/bindings/net/mediatek,net.yaml
index 3202dc7967c5..686b5c2fae40 100644
--- a/Documentation/devicetree/bindings/net/mediatek,net.yaml
+++ b/Documentation/devicetree/bindings/net/mediatek,net.yaml
@@ -68,6 +68,17 @@ properties:
Phandle to the syscon node that handles the path from GMAC to
PHY variants.
+ mediatek,pcie-mirror:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to the mediatek pcie-mirror controller.
+
+ mediatek,pctl:
+ $ref: /schemas/types.yaml#/definitions/phandle
+ description:
+ Phandle to the syscon node that handles the ports slew rate and
+ driver current.
+
mediatek,sgmiisys:
$ref: /schemas/types.yaml#/definitions/phandle-array
minItems: 1
@@ -131,15 +142,12 @@ allOf:
mediatek,infracfg: false
- mediatek,pctl:
- $ref: /schemas/types.yaml#/definitions/phandle
- description:
- Phandle to the syscon node that handles the ports slew rate and
- driver current.
-
mediatek,wed: false
mediatek,wed-pcie: false
+ else:
+ properties:
+ mediatek,pctl: false
- if:
properties:
@@ -201,12 +209,10 @@ allOf:
minItems: 1
maxItems: 1
- mediatek,pcie-mirror:
- $ref: /schemas/types.yaml#/definitions/phandle
- description:
- Phandle to the mediatek pcie-mirror controller.
-
mediatek,wed-pcie: false
+ else:
+ properties:
+ mediatek,pcie-mirror: false
- if:
properties:
diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
index 0ab124324eec..3eb65e63fdae 100644
--- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml
@@ -512,6 +512,12 @@ properties:
description:
Frequency division factor for MDC clock.
+ snps,tso:
+ $ref: /schemas/types.yaml#/definitions/flag
+ description:
+ Enables the TSO feature otherwise it will be managed by MAC HW capability
+ register.
+
mdio:
$ref: mdio.yaml#
unevaluatedProperties: false
@@ -595,41 +601,38 @@ allOf:
- if:
properties:
compatible:
- contains:
- enum:
- - allwinner,sun7i-a20-gmac
- - allwinner,sun8i-a83t-emac
- - allwinner,sun8i-h3-emac
- - allwinner,sun8i-r40-gmac
- - allwinner,sun8i-v3s-emac
- - allwinner,sun50i-a64-emac
- - loongson,ls2k-dwmac
- - loongson,ls7a-dwmac
- - ingenic,jz4775-mac
- - ingenic,x1000-mac
- - ingenic,x1600-mac
- - ingenic,x1830-mac
- - ingenic,x2000-mac
- - qcom,qcs404-ethqos
- - qcom,sa8775p-ethqos
- - qcom,sc8280xp-ethqos
- - qcom,sm8150-ethqos
- - snps,dwmac-4.00
- - snps,dwmac-4.10a
- - snps,dwmac-4.20a
- - snps,dwmac-5.10a
- - snps,dwmac-5.20
- - snps,dwxgmac
- - snps,dwxgmac-2.10
- - st,spear600-gmac
+ not:
+ contains:
+ enum:
+ - allwinner,sun7i-a20-gmac
+ - allwinner,sun8i-a83t-emac
+ - allwinner,sun8i-h3-emac
+ - allwinner,sun8i-r40-gmac
+ - allwinner,sun8i-v3s-emac
+ - allwinner,sun50i-a64-emac
+ - loongson,ls2k-dwmac
+ - loongson,ls7a-dwmac
+ - ingenic,jz4775-mac
+ - ingenic,x1000-mac
+ - ingenic,x1600-mac
+ - ingenic,x1830-mac
+ - ingenic,x2000-mac
+ - qcom,qcs404-ethqos
+ - qcom,sa8775p-ethqos
+ - qcom,sc8280xp-ethqos
+ - qcom,sm8150-ethqos
+ - snps,dwmac-4.00
+ - snps,dwmac-4.10a
+ - snps,dwmac-4.20a
+ - snps,dwmac-5.10a
+ - snps,dwmac-5.20
+ - snps,dwxgmac
+ - snps,dwxgmac-2.10
+ - st,spear600-gmac
then:
properties:
- snps,tso:
- $ref: /schemas/types.yaml#/definitions/flag
- description:
- Enables the TSO feature otherwise it will be managed by
- MAC HW capability register.
+ snps,tso: false
additionalProperties: true
--
2.43.0
On Wed, Jul 03, 2024 at 01:58:27PM -0600, Rob Herring (Arm) wrote: > Convention is DT schemas should define all properties at the top-level > and not inside of if/then schemas. That minimizes the if/then schemas > and is more future proof. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > v2: > - Drop the parts already applied from Serge > --- > .../devicetree/bindings/net/mediatek,net.yaml | 28 +++++--- > .../devicetree/bindings/net/snps,dwmac.yaml | 67 ++++++++++--------- For the DW *MAC bindings. Reviewed-by: Serge Semin <fancer.lancer@gmail.com> -Serge(y) > 2 files changed, 52 insertions(+), 43 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/mediatek,net.yaml b/Documentation/devicetree/bindings/net/mediatek,net.yaml > index 3202dc7967c5..686b5c2fae40 100644 > --- a/Documentation/devicetree/bindings/net/mediatek,net.yaml > +++ b/Documentation/devicetree/bindings/net/mediatek,net.yaml > @@ -68,6 +68,17 @@ properties: > Phandle to the syscon node that handles the path from GMAC to > PHY variants. > > + mediatek,pcie-mirror: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + Phandle to the mediatek pcie-mirror controller. > + > + mediatek,pctl: > + $ref: /schemas/types.yaml#/definitions/phandle > + description: > + Phandle to the syscon node that handles the ports slew rate and > + driver current. > + > mediatek,sgmiisys: > $ref: /schemas/types.yaml#/definitions/phandle-array > minItems: 1 > @@ -131,15 +142,12 @@ allOf: > > mediatek,infracfg: false > > - mediatek,pctl: > - $ref: /schemas/types.yaml#/definitions/phandle > - description: > - Phandle to the syscon node that handles the ports slew rate and > - driver current. > - > mediatek,wed: false > > mediatek,wed-pcie: false > + else: > + properties: > + mediatek,pctl: false > > - if: > properties: > @@ -201,12 +209,10 @@ allOf: > minItems: 1 > maxItems: 1 > > - mediatek,pcie-mirror: > - $ref: /schemas/types.yaml#/definitions/phandle > - description: > - Phandle to the mediatek pcie-mirror controller. > - > mediatek,wed-pcie: false > + else: > + properties: > + mediatek,pcie-mirror: false > > - if: > properties: > diff --git a/Documentation/devicetree/bindings/net/snps,dwmac.yaml b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > index 0ab124324eec..3eb65e63fdae 100644 > --- a/Documentation/devicetree/bindings/net/snps,dwmac.yaml > +++ b/Documentation/devicetree/bindings/net/snps,dwmac.yaml > @@ -512,6 +512,12 @@ properties: > description: > Frequency division factor for MDC clock. > > + snps,tso: > + $ref: /schemas/types.yaml#/definitions/flag > + description: > + Enables the TSO feature otherwise it will be managed by MAC HW capability > + register. > + > mdio: > $ref: mdio.yaml# > unevaluatedProperties: false > @@ -595,41 +601,38 @@ allOf: > - if: > properties: > compatible: > - contains: > - enum: > - - allwinner,sun7i-a20-gmac > - - allwinner,sun8i-a83t-emac > - - allwinner,sun8i-h3-emac > - - allwinner,sun8i-r40-gmac > - - allwinner,sun8i-v3s-emac > - - allwinner,sun50i-a64-emac > - - loongson,ls2k-dwmac > - - loongson,ls7a-dwmac > - - ingenic,jz4775-mac > - - ingenic,x1000-mac > - - ingenic,x1600-mac > - - ingenic,x1830-mac > - - ingenic,x2000-mac > - - qcom,qcs404-ethqos > - - qcom,sa8775p-ethqos > - - qcom,sc8280xp-ethqos > - - qcom,sm8150-ethqos > - - snps,dwmac-4.00 > - - snps,dwmac-4.10a > - - snps,dwmac-4.20a > - - snps,dwmac-5.10a > - - snps,dwmac-5.20 > - - snps,dwxgmac > - - snps,dwxgmac-2.10 > - - st,spear600-gmac > + not: > + contains: > + enum: > + - allwinner,sun7i-a20-gmac > + - allwinner,sun8i-a83t-emac > + - allwinner,sun8i-h3-emac > + - allwinner,sun8i-r40-gmac > + - allwinner,sun8i-v3s-emac > + - allwinner,sun50i-a64-emac > + - loongson,ls2k-dwmac > + - loongson,ls7a-dwmac > + - ingenic,jz4775-mac > + - ingenic,x1000-mac > + - ingenic,x1600-mac > + - ingenic,x1830-mac > + - ingenic,x2000-mac > + - qcom,qcs404-ethqos > + - qcom,sa8775p-ethqos > + - qcom,sc8280xp-ethqos > + - qcom,sm8150-ethqos > + - snps,dwmac-4.00 > + - snps,dwmac-4.10a > + - snps,dwmac-4.20a > + - snps,dwmac-5.10a > + - snps,dwmac-5.20 > + - snps,dwxgmac > + - snps,dwxgmac-2.10 > + - st,spear600-gmac > > then: > properties: > - snps,tso: > - $ref: /schemas/types.yaml#/definitions/flag > - description: > - Enables the TSO feature otherwise it will be managed by > - MAC HW capability register. > + snps,tso: false > > additionalProperties: true > > -- > 2.43.0 >
On 03/07/2024 21:58, Rob Herring (Arm) wrote: > Convention is DT schemas should define all properties at the top-level > and not inside of if/then schemas. That minimizes the if/then schemas > and is more future proof. > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org> > --- > v2: > - Drop the parts already applied from Serge Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
© 2016 - 2024 Red Hat, Inc.