| Message ID | 20220813154415.349091-6-arinc.unal@arinc9.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | completely rework mediatek,mt7530 binding | expand |
On Sat, Aug 13, 2022 at 06:44:13PM +0300, Arınç ÜNAL wrote: > Remove unnecessary lines as they are already included from the referred > dsa.yaml. You are duplicating the schema and then removing parts twice. I would combine patches 4 and 5 or reverse the order. > > Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> > --- > .../bindings/net/dsa/mediatek,mt7530.yaml | 27 ------------------- > 1 file changed, 27 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > index ff51a2f6875f..a27cb4fa490f 100644 > --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > @@ -162,15 +162,8 @@ allOf: > > patternProperties: > "^(ethernet-)?ports$": > - type: object > - > patternProperties: > "^(ethernet-)?port@[0-9]+$": > - type: object > - description: Ethernet switch ports > - > - unevaluatedProperties: false > - > properties: > reg: > description: > @@ -178,7 +171,6 @@ allOf: > 0 to 5 for user ports. > > allOf: > - - $ref: dsa-port.yaml# > - if: This 'if' schema is the only part you need actually (though you have to create the node structure). > properties: > label: > @@ -186,7 +178,6 @@ allOf: > - const: cpu > then: > required: > - - reg > - phy-mode > > - if: > @@ -200,15 +191,8 @@ allOf: > > patternProperties: > "^(ethernet-)?ports$": > - type: object > - > patternProperties: > "^(ethernet-)?port@[0-9]+$": > - type: object > - description: Ethernet switch ports > - > - unevaluatedProperties: false > - > properties: > reg: > description: > @@ -216,7 +200,6 @@ allOf: > 0 to 5 for user ports. > > allOf: > - - $ref: dsa-port.yaml# > - if: > properties: > label: > @@ -224,7 +207,6 @@ allOf: > - const: cpu > then: > required: > - - reg > - phy-mode > > - if: > @@ -238,15 +220,8 @@ allOf: > > patternProperties: > "^(ethernet-)?ports$": > - type: object > - > patternProperties: > "^(ethernet-)?port@[0-9]+$": > - type: object > - description: Ethernet switch ports > - > - unevaluatedProperties: false > - > properties: > reg: > description: > @@ -254,7 +229,6 @@ allOf: > 0 to 5 for user ports. > > allOf: > - - $ref: dsa-port.yaml# > - if: > properties: > label: > @@ -262,7 +236,6 @@ allOf: > - const: cpu > then: > required: > - - reg > - phy-mode > > unevaluatedProperties: false > -- > 2.34.1 > >
On 17.08.2022 00:14, Rob Herring wrote: > On Sat, Aug 13, 2022 at 06:44:13PM +0300, Arınç ÜNAL wrote: >> Remove unnecessary lines as they are already included from the referred >> dsa.yaml. > > You are duplicating the schema and then removing parts twice. I would > combine patches 4 and 5 or reverse the order. Will combine. > >> >> Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> >> --- >> .../bindings/net/dsa/mediatek,mt7530.yaml | 27 ------------------- >> 1 file changed, 27 deletions(-) >> >> diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml >> index ff51a2f6875f..a27cb4fa490f 100644 >> --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml >> +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml >> @@ -162,15 +162,8 @@ allOf: >> >> patternProperties: >> "^(ethernet-)?ports$": >> - type: object >> - >> patternProperties: >> "^(ethernet-)?port@[0-9]+$": >> - type: object >> - description: Ethernet switch ports >> - >> - unevaluatedProperties: false >> - >> properties: >> reg: >> description: >> @@ -178,7 +171,6 @@ allOf: >> 0 to 5 for user ports. >> >> allOf: >> - - $ref: dsa-port.yaml# >> - if: > > This 'if' schema is the only part you need actually (though you have to > create the node structure). Do you mean that I should take "if:" out of allOf? > >> properties: >> label: >> @@ -186,7 +178,6 @@ allOf: >> - const: cpu >> then: >> required: >> - - reg >> - phy-mode >> >> - if: >> @@ -200,15 +191,8 @@ allOf: >> >> patternProperties: >> "^(ethernet-)?ports$": >> - type: object >> - >> patternProperties: >> "^(ethernet-)?port@[0-9]+$": >> - type: object >> - description: Ethernet switch ports >> - >> - unevaluatedProperties: false >> - >> properties: >> reg: >> description: >> @@ -216,7 +200,6 @@ allOf: >> 0 to 5 for user ports. >> >> allOf: >> - - $ref: dsa-port.yaml# >> - if: >> properties: >> label: >> @@ -224,7 +207,6 @@ allOf: >> - const: cpu >> then: >> required: >> - - reg >> - phy-mode >> >> - if: >> @@ -238,15 +220,8 @@ allOf: >> >> patternProperties: >> "^(ethernet-)?ports$": >> - type: object >> - >> patternProperties: >> "^(ethernet-)?port@[0-9]+$": >> - type: object >> - description: Ethernet switch ports >> - >> - unevaluatedProperties: false >> - >> properties: >> reg: >> description: >> @@ -254,7 +229,6 @@ allOf: >> 0 to 5 for user ports. >> >> allOf: >> - - $ref: dsa-port.yaml# >> - if: >> properties: >> label: >> @@ -262,7 +236,6 @@ allOf: >> - const: cpu >> then: >> required: >> - - reg >> - phy-mode >> >> unevaluatedProperties: false >> -- >> 2.34.1 >> >>
diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml index ff51a2f6875f..a27cb4fa490f 100644 --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml @@ -162,15 +162,8 @@ allOf: patternProperties: "^(ethernet-)?ports$": - type: object - patternProperties: "^(ethernet-)?port@[0-9]+$": - type: object - description: Ethernet switch ports - - unevaluatedProperties: false - properties: reg: description: @@ -178,7 +171,6 @@ allOf: 0 to 5 for user ports. allOf: - - $ref: dsa-port.yaml# - if: properties: label: @@ -186,7 +178,6 @@ allOf: - const: cpu then: required: - - reg - phy-mode - if: @@ -200,15 +191,8 @@ allOf: patternProperties: "^(ethernet-)?ports$": - type: object - patternProperties: "^(ethernet-)?port@[0-9]+$": - type: object - description: Ethernet switch ports - - unevaluatedProperties: false - properties: reg: description: @@ -216,7 +200,6 @@ allOf: 0 to 5 for user ports. allOf: - - $ref: dsa-port.yaml# - if: properties: label: @@ -224,7 +207,6 @@ allOf: - const: cpu then: required: - - reg - phy-mode - if: @@ -238,15 +220,8 @@ allOf: patternProperties: "^(ethernet-)?ports$": - type: object - patternProperties: "^(ethernet-)?port@[0-9]+$": - type: object - description: Ethernet switch ports - - unevaluatedProperties: false - properties: reg: description: @@ -254,7 +229,6 @@ allOf: 0 to 5 for user ports. allOf: - - $ref: dsa-port.yaml# - if: properties: label: @@ -262,7 +236,6 @@ allOf: - const: cpu then: required: - - reg - phy-mode unevaluatedProperties: false
Remove unnecessary lines as they are already included from the referred dsa.yaml. Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> --- .../bindings/net/dsa/mediatek,mt7530.yaml | 27 ------------------- 1 file changed, 27 deletions(-)