Several bindings for ethernet switches are available for non-dsa switches
by way of ethernet-switch.yaml. Remove these duplicate entries and utilize
the common bindings for the VSC7514.
Signed-off-by: Colin Foster <[email protected]>
Suggested-by: Vladimir Oltean <[email protected]>
---
.../bindings/net/mscc,vsc7514-switch.yaml | 36 +------------------
1 file changed, 1 insertion(+), 35 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
index ee0a504bdb24..1703bd46c3ca 100644
--- a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
+++ b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
@@ -19,11 +19,8 @@ description: |
packet extraction/injection.
properties:
- $nodename:
- pattern: "^switch@[0-9a-f]+$"
-
compatible:
- const: mscc,vsc7514-switch
+ $ref: ethernet-switch.yaml#
reg:
items:
@@ -88,47 +85,16 @@ properties:
- const: fdma
ethernet-ports:
- type: object
-
- properties:
- '#address-cells':
- const: 1
- '#size-cells':
- const: 0
additionalProperties: false
patternProperties:
"^port@[0-9a-f]+$":
- type: object
- description: Ethernet ports handled by the switch
$ref: ethernet-controller.yaml#
unevaluatedProperties: false
- properties:
- reg:
- description: Switch port number
-
- phy-handle: true
-
- phy-mode: true
-
- fixed-link: true
-
- mac-address: true
-
- required:
- - reg
- - phy-mode
-
- oneOf:
- - required:
- - phy-handle
- - required:
- - fixed-link
-
required:
- compatible
- reg
--
2.25.1
On Mon, 24 Oct 2022 22:03:55 -0700, Colin Foster wrote:
> Several bindings for ethernet switches are available for non-dsa switches
> by way of ethernet-switch.yaml. Remove these duplicate entries and utilize
> the common bindings for the VSC7514.
>
> Signed-off-by: Colin Foster <[email protected]>
> Suggested-by: Vladimir Oltean <[email protected]>
> ---
> .../bindings/net/mscc,vsc7514-switch.yaml | 36 +------------------
> 1 file changed, 1 insertion(+), 35 deletions(-)
>
My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
on your patch (DT_CHECKER_FLAGS is new in v5.13):
yamllint warnings/errors:
dtschema/dtc warnings/errors:
./Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml: Unable to find schema file matching $id: http://devicetree.org/schemas/net/ethernet-switch.yaml
Documentation/devicetree/bindings/net/mscc,vsc7514-switch.example.dtb:0:0: /example-0/switch@1010000: failed to match any schema with compatible: ['mscc,vsc7514-switch']
doc reference errors (make refcheckdocs):
See https://patchwork.ozlabs.org/patch/
This check can fail if there are any dependencies. The base for a patch
series is generally the most recent rc1.
If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure 'yamllint' is installed and dt-schema is up to
date:
pip3 install dtschema --upgrade
Please check and re-submit.
On Tue, Oct 25, 2022 at 03:05:02PM -0500, Rob Herring wrote:
> On Mon, 24 Oct 2022 22:03:55 -0700, Colin Foster wrote:
> > Several bindings for ethernet switches are available for non-dsa switches
> > by way of ethernet-switch.yaml. Remove these duplicate entries and utilize
> > the common bindings for the VSC7514.
> >
> > Signed-off-by: Colin Foster <[email protected]>
> > Suggested-by: Vladimir Oltean <[email protected]>
> > ---
> > .../bindings/net/mscc,vsc7514-switch.yaml | 36 +------------------
> > 1 file changed, 1 insertion(+), 35 deletions(-)
> >
>
> My bot found errors running 'make DT_CHECKER_FLAGS=-m dt_binding_check'
> on your patch (DT_CHECKER_FLAGS is new in v5.13):
>
> yamllint warnings/errors:
>
> dtschema/dtc warnings/errors:
> ./Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml: Unable to find schema file matching $id: http://devicetree.org/schemas/net/ethernet-switch.yaml
> Documentation/devicetree/bindings/net/mscc,vsc7514-switch.example.dtb:0:0: /example-0/switch@1010000: failed to match any schema with compatible: ['mscc,vsc7514-switch']
This one you can ignore. The base tree is reset if a prior patch failed.
Rob
On Mon, Oct 24, 2022 at 10:03:55PM -0700, Colin Foster wrote:
> Several bindings for ethernet switches are available for non-dsa switches
> by way of ethernet-switch.yaml. Remove these duplicate entries and utilize
> the common bindings for the VSC7514.
>
> Signed-off-by: Colin Foster <[email protected]>
> Suggested-by: Vladimir Oltean <[email protected]>
> ---
> .../bindings/net/mscc,vsc7514-switch.yaml | 36 +------------------
> 1 file changed, 1 insertion(+), 35 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> index ee0a504bdb24..1703bd46c3ca 100644
> --- a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> +++ b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> @@ -19,11 +19,8 @@ description: |
> packet extraction/injection.
>
> properties:
> - $nodename:
> - pattern: "^switch@[0-9a-f]+$"
> -
> compatible:
> - const: mscc,vsc7514-switch
> + $ref: ethernet-switch.yaml#
??? 'compatible' is a node?
Rob
On Wed, Oct 26, 2022 at 12:47:04PM -0500, Rob Herring wrote:
> On Mon, Oct 24, 2022 at 10:03:55PM -0700, Colin Foster wrote:
> > Several bindings for ethernet switches are available for non-dsa switches
> > by way of ethernet-switch.yaml. Remove these duplicate entries and utilize
> > the common bindings for the VSC7514.
> >
> > Signed-off-by: Colin Foster <[email protected]>
> > Suggested-by: Vladimir Oltean <[email protected]>
> > ---
> > .../bindings/net/mscc,vsc7514-switch.yaml | 36 +------------------
> > 1 file changed, 1 insertion(+), 35 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> > index ee0a504bdb24..1703bd46c3ca 100644
> > --- a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> > +++ b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml
> > @@ -19,11 +19,8 @@ description: |
> > packet extraction/injection.
> >
> > properties:
> > - $nodename:
> > - pattern: "^switch@[0-9a-f]+$"
> > -
> > compatible:
> > - const: mscc,vsc7514-switch
> > + $ref: ethernet-switch.yaml#
>
> ??? 'compatible' is a node?
I need to look more into this. The compatible string should remain
mscc,vsc7514-switch, but I think the pattern properties should
probably be updated to "^(ethernet-)switch@[0-9a-f]+$" to match
ethernet-switch.yaml.
I didn't think the ethernet-switch.yaml could be at the top level for
the 7514, but I must have been mistaken. Either way - not under
compatible as you're pointing out. Much appreciated.
>
> Rob