Commit 68e3e3be authored by Colin Foster's avatar Colin Foster Committed by David S. Miller
Browse files

dt-bindings: net: add generic ethernet-switch-port binding 



The dsa-port.yaml binding had several references that can be common to all
ethernet ports, not just dsa-specific ones. Break out the generic bindings
to ethernet-switch-port.yaml they can be used by non-dsa drivers.

Signed-off-by: default avatarColin Foster <colin.foster@in-advantage.com>
Suggested-by: default avatarVladimir Oltean <olteanv@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7f5bccc8

Documentation/devicetree/bindings/net/dsa/dsa-port.yaml

+5 −23
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
$id: http://devicetree.org/schemas/net/dsa/dsa-port.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Ethernet Switch port

title: Generic DSA Switch Port



maintainers:

  - Andrew Lunn <andrew@lunn.ch>
@@ -12,10 +12,11 @@ maintainers: 
  - Vladimir Oltean <olteanv@gmail.com>



description:

  Ethernet switch port Description

  A DSA switch port is a component of a switch that manages one MAC, and can

  pass Ethernet frames. It can act as a stanadard Ethernet switch port, or have

  DSA-specific functionality.



allOf:

  - $ref: /schemas/net/ethernet-controller.yaml#

$ref: /schemas/net/ethernet-switch-port.yaml#



properties:

  reg:
@@ -58,25 +59,6 @@ properties: 
      - rtl8_4t

      - seville



  phy-handle: true



  phy-mode: true



  fixed-link: true



  mac-address: true



  sfp: true



  managed: true



  rx-internal-delay-ps: true



  tx-internal-delay-ps: true



required:

  - reg



# CPU and DSA ports must have phylink-compatible link descriptions

if:

  oneOf:

Documentation/devicetree/bindings/net/ethernet-switch-port.yaml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/ethernet-switch-port.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Generic Ethernet Switch Port



maintainers:

  - Andrew Lunn <andrew@lunn.ch>

  - Florian Fainelli <f.fainelli@gmail.com>

  - Vladimir Oltean <olteanv@gmail.com>



description:

  An Ethernet switch port is a component of a switch that manages one MAC, and

  can pass Ethernet frames.



$ref: ethernet-controller.yaml#



properties:

  reg:

    description: Port number



additionalProperties: true



...

Documentation/devicetree/bindings/net/ethernet-switch.yaml

+1 −5
Original line number Diff line number Diff line
@@ -40,10 +40,6 @@ patternProperties: 
        type: object

        description: Ethernet switch ports



        $ref: ethernet-controller.yaml#



        additionalProperties: true



oneOf:

  - required:

      - ports
@@ -60,7 +56,7 @@ $defs: 
    patternProperties:

      "^(ethernet-)?port@[0-9]+$":

        description: Ethernet switch ports

        $ref: ethernet-controller.yaml#

        $ref: ethernet-switch-port.yaml#

        unevaluatedProperties: false



...

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14543,6 +14543,7 @@ M: Florian Fainelli <f.fainelli@gmail.com> 
M:	Vladimir Oltean <olteanv@gmail.com>

S:	Maintained

F:	Documentation/devicetree/bindings/net/dsa/

F:	Documentation/devicetree/bindings/net/ethernet-switch-port.yaml

F:	Documentation/devicetree/bindings/net/ethernet-switch.yaml

F:	drivers/net/dsa/

F:	include/linux/dsa/