Message ID | 20221228015433.73919-1-mig@semihalf.com |
---|---|
State | Superseded |
Headers | show |
Series | [v2] dt-bindings: net: marvell,orion-mdio: Fix examples | expand |
On 28/12/2022 02:54, Michał Grzelak wrote: > As stated in marvell-orion-mdio.txt deleted in commit 0781434af811f > ("dt-bindings: net: orion-mdio: Convert to JSON schema") if > 'interrupts' property is present, width of 'reg' should be 0x84. > Otherwise, width of 'reg' should be 0x4. Fix 'examples:' and add > constraints checking whether 'interrupts' property is present > and validate it against fixed values in reg. > > Signed-off-by: Michał Grzelak <mig@semihalf.com> > --- > Changelog: > v1->v2: > - remove second example > - add 'if:' constraint to 'allOf:' > - move 'allOf:' before 'examples:' > > .../bindings/net/marvell,orion-mdio.yaml | 31 ++++++++++++++++--- > 1 file changed, 27 insertions(+), 4 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml b/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml > index d2906b4a0f59..381cd8edebed 100644 > --- a/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml > +++ b/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml > @@ -16,9 +16,6 @@ description: | > 8k has a second unit which provides an interface with the xMDIO bus. This > driver handles these interfaces. > > -allOf: > - - $ref: "mdio.yaml#" > - > properties: > compatible: > enum: > @@ -39,13 +36,39 @@ required: > - compatible > - reg > > +allOf: > + Drop blank line. > + - $ref: "mdio.yaml#" Drop quotes while moving it. > + > + - if: > + required: > + - interrupts > + > + then: > + properties: > + reg: > + items: > + - items: > + - $ref: /schemas/types.yaml#/definitions/cell > + - const: 0x84 > + > + else: > + properties: > + reg: > + items: > + - items: > + - $ref: /schemas/types.yaml#/definitions/cell > + - enum: > + - 0x4 > + - 0x10 Rest looks good. Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Best regards, Krzysztof
diff --git a/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml b/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml index d2906b4a0f59..381cd8edebed 100644 --- a/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml +++ b/Documentation/devicetree/bindings/net/marvell,orion-mdio.yaml @@ -16,9 +16,6 @@ description: | 8k has a second unit which provides an interface with the xMDIO bus. This driver handles these interfaces. -allOf: - - $ref: "mdio.yaml#" - properties: compatible: enum: @@ -39,13 +36,39 @@ required: - compatible - reg +allOf: + + - $ref: "mdio.yaml#" + + - if: + required: + - interrupts + + then: + properties: + reg: + items: + - items: + - $ref: /schemas/types.yaml#/definitions/cell + - const: 0x84 + + else: + properties: + reg: + items: + - items: + - $ref: /schemas/types.yaml#/definitions/cell + - enum: + - 0x4 + - 0x10 + unevaluatedProperties: false examples: - | mdio@d0072004 { compatible = "marvell,orion-mdio"; - reg = <0xd0072004 0x4>; + reg = <0xd0072004 0x84>; #address-cells = <1>; #size-cells = <0>; interrupts = <30>;
As stated in marvell-orion-mdio.txt deleted in commit 0781434af811f ("dt-bindings: net: orion-mdio: Convert to JSON schema") if 'interrupts' property is present, width of 'reg' should be 0x84. Otherwise, width of 'reg' should be 0x4. Fix 'examples:' and add constraints checking whether 'interrupts' property is present and validate it against fixed values in reg. Signed-off-by: Michał Grzelak <mig@semihalf.com> --- Changelog: v1->v2: - remove second example - add 'if:' constraint to 'allOf:' - move 'allOf:' before 'examples:' .../bindings/net/marvell,orion-mdio.yaml | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-)