| Message ID | 20230916110902.234273-6-arinc.unal@arinc9.com |
|---|---|
| State | New |
| Headers | show |
| Series | [net-next,v2,01/10] net: dsa: mt7530: register OF node for internal MDIO bus | expand |
On Sat, Sep 16, 2023 at 02:08:57PM +0300, Arınç ÜNAL wrote: > Some DSA subdrivers register the MDIO bus of the switch they control. Or > let the DSA driver register the MDIO bus. The node for these buses are > either required or optional, depending on the subdriver. Document this on > all of the affected DSA switch schemas. > > The attributes of a DSA subdriver that lets the DSA driver register the > bus: > - ds->ops->phy_read() and ds->ops->phy_write() are present. > - ds->slave_mii_bus is not populated by the DSA subdriver. > - The bus is registered non-OF-based or OF-based. Registered OF-based if > "mdio" child node is defined. > > The affected DSA switch schemas are documented below. > > - brcm,b53.yaml > > drivers/net/dsa/b53/b53_common.c: > - The DSA subdriver lets the DSA driver register the bus. > > --- This will cause everything after here to be dropped when the patch is applied. In any case, write binding commit message without Linux details. Ideally, variations should be based on hardware differences not driver policies. > > - mediatek,mt7530.yaml > > drivers/net/dsa/mt7530.c: > - The DSA subdriver won't let the DSA driver register the bus. > - No ds->ops->phy_read() or ds->ops->phy_write(). > - Registers the bus non-OF-based or OF-based. Registers OF-based if "mdio" > child node is defined. > > --- > > - microchip,ksz.yaml > - microchip,lan937x.yaml > > drivers/net/dsa/microchip/ksz_common.c: > - The DSA subdriver won't let the DSA driver register the bus when "mdio" > child node is defined. Registers the bus OF-based only. Registers the bus > when "mdio" child node is defined. > - mdio_np = of_get_child_by_name(dev->dev->of_node, "mdio"); > if (!mdio_np) > return 0; > ds->slave_mii_bus = bus; > > --- > > - nxp,sja1105.yaml > > drivers/net/dsa/sja1105/sja1105_mdio.c: > - The DSA subdriver won't let the DSA driver register the bus. > - No ds->ops->phy_read() or ds->ops->phy_write(). > - Registers multiple buses OF-based only. Registers the buses when "mdios" > child node and "nxp,sja1110-base-tx-mdio" and "nxp,sja1110-base-t1-mdio" > compatible strings per child node under "mdios" is defined. > - mdio_node = of_get_child_by_name(switch_node, "mdios"); > if (!mdio_node) > return 0; > - np = of_get_compatible_child(mdio_node, "nxp,sja1110-base-tx-mdio"); > if (!np) > return 0; > - np = of_get_compatible_child(mdio_node, "nxp,sja1110-base-t1-mdio"); > if (!np) > return 0; > > --- > > - qca8k.yaml > > drivers/net/dsa/qca/qca8k-8xxx.c: > - The DSA subdriver won't let the DSA driver register the bus. > - No ds->ops->phy_read() or ds->ops->phy_write(). > - Registers the bus non-OF-based or OF-based. Registers OF-based if "mdio" > child node is defined. > - mdio = of_get_child_by_name(priv->dev->of_node, "mdio"); > > --- > > - realtek.yaml > > drivers/net/dsa/realtek/realtek-smi.c: > - The DSA subdriver won't let the DSA driver register the bus. Registers > the bus OF-based only. Registering the bus is mandatory. Registers the > bus when compatible string "realtek,smi-mdio" on a child node is defined. > - mdio_np = of_get_compatible_child(priv->dev->of_node, "realtek,smi-mdio"); > if (!mdio_np) > return -ENODEV; > ds->slave_mii_bus = priv->slave_mii_bus; > > drivers/net/dsa/realtek/realtek-mdio.c: > - The DSA subdriver lets the DSA driver register the bus. > > --- > > - renesas,rzn1-a5psw.yaml > > drivers/net/dsa/rzn1_a5psw.c: > - The DSA subdriver won't let the DSA driver register the bus. > - No ds->ops->phy_read() or ds->ops->phy_write(). > - Registers the bus OF-based only. Registers the bus when "mdio" child node > is defined. > - mdio = of_get_child_by_name(dev->of_node, "mdio"); > if (of_device_is_available(mdio)) > ret = a5psw_probe_mdio(a5psw, mdio); > > --- > > - ar9331.txt > > drivers/net/dsa/qca/ar9331.c: > - The DSA subdriver won't let the DSA driver register the bus. > - No ds->ops->phy_read() or ds->ops->phy_write(). > - Registers the bus OF-based only. Registering the bus is mandatory. > Registers the bus when "mdio" child node is defined. > - mnp = of_get_child_by_name(np, "mdio"); > if (!mnp) > return -ENODEV; > > --- > > - lan9303.txt > > drivers/net/dsa/lan9303-core.c: > - The DSA subdriver lets the DSA driver register the bus. > > --- > > - lantiq-gswip.txt > > drivers/net/dsa/lantiq_gswip.c: > - The DSA subdriver won't let the DSA driver register the bus. > - No ds->ops->phy_read() or ds->ops->phy_write(). > - Registers the bus OF-based only. Registers the bus when compatible string > "lantiq,xrx200-mdio" on a child node is defined. > - mdio_np = of_get_compatible_child(dev->of_node, "lantiq,xrx200-mdio"); > if (mdio_np) > err = gswip_mdio(priv, mdio_np); > > --- > > - marvell.txt > > drivers/net/dsa/mv88e6xxx/chip.c: > - The DSA subdriver won't let the DSA driver register the bus. > - ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); > - Registers the bus non-OF-based or OF-based. Registers OF-based if "mdio" > child node is defined. > > --- > > - vitesse,vsc73xx.txt > > drivers/net/dsa/vitesse-vsc73xx-core.c: > - The DSA subdriver lets the DSA driver register the bus. > > I will convert the non json-schema documents accordingly. > > Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> > --- > .../devicetree/bindings/net/dsa/brcm,b53.yaml | 7 +++++++ > .../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 7 +++++++ > .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 7 +++++++ > .../devicetree/bindings/net/dsa/microchip,lan937x.yaml | 3 +++ > .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 3 ++- > Documentation/devicetree/bindings/net/dsa/qca8k.yaml | 10 +++++----- > Documentation/devicetree/bindings/net/dsa/realtek.yaml | 4 ++++ > .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 3 +++ > 8 files changed, 38 insertions(+), 6 deletions(-) > > diff --git a/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml > index 4c78c546343f..0bb2ff0cf2d0 100644 > --- a/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml > @@ -65,6 +65,13 @@ properties: > - brcm,bcm63268-switch > - const: brcm,bcm63xx-switch > > + mdio: > + description: > + The optional node for the MDIO bus of the switch. The bus will be > + registered non-OF-based if this is not defined. > + $ref: /schemas/net/mdio.yaml# > + unevaluatedProperties: false > + > required: > - compatible > - reg > diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > index e532c6b795f4..31a7dbbf704d 100644 > --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml > @@ -151,6 +151,13 @@ properties: > ethsys. > maxItems: 1 > > + mdio: > + description: > + The optional node for the MDIO bus of the switch. The bus will be > + registered non-OF-based if this is not defined. > + $ref: /schemas/net/mdio.yaml# > + unevaluatedProperties: false > + > patternProperties: > "^(ethernet-)?ports$": > type: object > diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml > index e51be1ac0362..20e4174fe1ab 100644 > --- a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml > @@ -49,6 +49,13 @@ properties: > Set if the output SYNCLKO clock should be disabled. Do not mix with > microchip,synclko-125. > > + mdio: > + description: > + The optional node for the MDIO bus of the switch. The bus will be > + registered non-OF-based if this is not defined. > + $ref: /schemas/net/mdio.yaml# > + unevaluatedProperties: false > + > required: > - compatible > - reg > diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml > index d187034fb31a..33a4926b2d94 100644 > --- a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml > @@ -32,6 +32,9 @@ properties: > maxItems: 1 > > mdio: > + description: > + The optional node for the MDIO bus of the switch. The bus will be > + registered non-OF-based if this is not defined. > $ref: /schemas/net/mdio.yaml# > unevaluatedProperties: false > > diff --git a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml > index 3f3c4ecc6442..6838dc165d06 100644 > --- a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml > @@ -37,7 +37,8 @@ properties: > > mdios: > description: > - The optional container node for the two MDIO buses of the SJA1110. > + The optional container node for the two MDIO buses of the SJA1110. The bus > + won't be registered if its node is not defined. > type: object > > properties: > diff --git a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml > index df64eebebe18..c472050582be 100644 > --- a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml > @@ -60,13 +60,13 @@ properties: > B68 on the QCA832x and B49 on the QCA833x. > > mdio: > + description: > + The optional node for the MDIO bus of the switch. The bus will be > + registered non-OF-based if this is not defined. In that case, the legacy > + mapping will be used. With the legacy mapping, the reg corresponding to > + the MDIO bus is the switch reg with an offset of -1. > $ref: /schemas/net/mdio.yaml# > unevaluatedProperties: false > - description: Qca8k switch have an internal mdio to access switch port. > - If this is not present, the legacy mapping is used and the > - internal mdio access is used. > - With the legacy mapping the reg corresponding to the internal > - mdio is the switch reg with an offset of -1. > > $ref: dsa.yaml# > > diff --git a/Documentation/devicetree/bindings/net/dsa/realtek.yaml b/Documentation/devicetree/bindings/net/dsa/realtek.yaml > index 7eb025df0df8..62ebaa4b5ae3 100644 > --- a/Documentation/devicetree/bindings/net/dsa/realtek.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/realtek.yaml > @@ -96,6 +96,10 @@ properties: > - '#interrupt-cells' > > mdio: > + description: > + The node for the MDIO bus of the switch. For the MDIO controlled switches, > + this is optional and the bus will be registered non-OF-based if this is > + not defined. > $ref: /schemas/net/mdio.yaml# > unevaluatedProperties: false > > diff --git a/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml b/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml > index 833d2f68daa1..9ad9f5cdf688 100644 > --- a/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml > +++ b/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml > @@ -46,6 +46,9 @@ properties: > maxItems: 1 > > mdio: > + description: > + The optional node for the MDIO bus of the switch. The bus won't be > + registered if this is not defined. > $ref: /schemas/net/mdio.yaml# > unevaluatedProperties: false > > -- > 2.39.2 >
diff --git a/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml index 4c78c546343f..0bb2ff0cf2d0 100644 --- a/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml +++ b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml @@ -65,6 +65,13 @@ properties: - brcm,bcm63268-switch - const: brcm,bcm63xx-switch + mdio: + description: + The optional node for the MDIO bus of the switch. The bus will be + registered non-OF-based if this is not defined. + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + required: - compatible - reg diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml index e532c6b795f4..31a7dbbf704d 100644 --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml @@ -151,6 +151,13 @@ properties: ethsys. maxItems: 1 + mdio: + description: + The optional node for the MDIO bus of the switch. The bus will be + registered non-OF-based if this is not defined. + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + patternProperties: "^(ethernet-)?ports$": type: object diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml index e51be1ac0362..20e4174fe1ab 100644 --- a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml +++ b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml @@ -49,6 +49,13 @@ properties: Set if the output SYNCLKO clock should be disabled. Do not mix with microchip,synclko-125. + mdio: + description: + The optional node for the MDIO bus of the switch. The bus will be + registered non-OF-based if this is not defined. + $ref: /schemas/net/mdio.yaml# + unevaluatedProperties: false + required: - compatible - reg diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml index d187034fb31a..33a4926b2d94 100644 --- a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml +++ b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml @@ -32,6 +32,9 @@ properties: maxItems: 1 mdio: + description: + The optional node for the MDIO bus of the switch. The bus will be + registered non-OF-based if this is not defined. $ref: /schemas/net/mdio.yaml# unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml index 3f3c4ecc6442..6838dc165d06 100644 --- a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml +++ b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml @@ -37,7 +37,8 @@ properties: mdios: description: - The optional container node for the two MDIO buses of the SJA1110. + The optional container node for the two MDIO buses of the SJA1110. The bus + won't be registered if its node is not defined. type: object properties: diff --git a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml index df64eebebe18..c472050582be 100644 --- a/Documentation/devicetree/bindings/net/dsa/qca8k.yaml +++ b/Documentation/devicetree/bindings/net/dsa/qca8k.yaml @@ -60,13 +60,13 @@ properties: B68 on the QCA832x and B49 on the QCA833x. mdio: + description: + The optional node for the MDIO bus of the switch. The bus will be + registered non-OF-based if this is not defined. In that case, the legacy + mapping will be used. With the legacy mapping, the reg corresponding to + the MDIO bus is the switch reg with an offset of -1. $ref: /schemas/net/mdio.yaml# unevaluatedProperties: false - description: Qca8k switch have an internal mdio to access switch port. - If this is not present, the legacy mapping is used and the - internal mdio access is used. - With the legacy mapping the reg corresponding to the internal - mdio is the switch reg with an offset of -1. $ref: dsa.yaml# diff --git a/Documentation/devicetree/bindings/net/dsa/realtek.yaml b/Documentation/devicetree/bindings/net/dsa/realtek.yaml index 7eb025df0df8..62ebaa4b5ae3 100644 --- a/Documentation/devicetree/bindings/net/dsa/realtek.yaml +++ b/Documentation/devicetree/bindings/net/dsa/realtek.yaml @@ -96,6 +96,10 @@ properties: - '#interrupt-cells' mdio: + description: + The node for the MDIO bus of the switch. For the MDIO controlled switches, + this is optional and the bus will be registered non-OF-based if this is + not defined. $ref: /schemas/net/mdio.yaml# unevaluatedProperties: false diff --git a/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml b/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml index 833d2f68daa1..9ad9f5cdf688 100644 --- a/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml +++ b/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml @@ -46,6 +46,9 @@ properties: maxItems: 1 mdio: + description: + The optional node for the MDIO bus of the switch. The bus won't be + registered if this is not defined. $ref: /schemas/net/mdio.yaml# unevaluatedProperties: false
Some DSA subdrivers register the MDIO bus of the switch they control. Or let the DSA driver register the MDIO bus. The node for these buses are either required or optional, depending on the subdriver. Document this on all of the affected DSA switch schemas. The attributes of a DSA subdriver that lets the DSA driver register the bus: - ds->ops->phy_read() and ds->ops->phy_write() are present. - ds->slave_mii_bus is not populated by the DSA subdriver. - The bus is registered non-OF-based or OF-based. Registered OF-based if "mdio" child node is defined. The affected DSA switch schemas are documented below. - brcm,b53.yaml drivers/net/dsa/b53/b53_common.c: - The DSA subdriver lets the DSA driver register the bus. --- - mediatek,mt7530.yaml drivers/net/dsa/mt7530.c: - The DSA subdriver won't let the DSA driver register the bus. - No ds->ops->phy_read() or ds->ops->phy_write(). - Registers the bus non-OF-based or OF-based. Registers OF-based if "mdio" child node is defined. --- - microchip,ksz.yaml - microchip,lan937x.yaml drivers/net/dsa/microchip/ksz_common.c: - The DSA subdriver won't let the DSA driver register the bus when "mdio" child node is defined. Registers the bus OF-based only. Registers the bus when "mdio" child node is defined. - mdio_np = of_get_child_by_name(dev->dev->of_node, "mdio"); if (!mdio_np) return 0; ds->slave_mii_bus = bus; --- - nxp,sja1105.yaml drivers/net/dsa/sja1105/sja1105_mdio.c: - The DSA subdriver won't let the DSA driver register the bus. - No ds->ops->phy_read() or ds->ops->phy_write(). - Registers multiple buses OF-based only. Registers the buses when "mdios" child node and "nxp,sja1110-base-tx-mdio" and "nxp,sja1110-base-t1-mdio" compatible strings per child node under "mdios" is defined. - mdio_node = of_get_child_by_name(switch_node, "mdios"); if (!mdio_node) return 0; - np = of_get_compatible_child(mdio_node, "nxp,sja1110-base-tx-mdio"); if (!np) return 0; - np = of_get_compatible_child(mdio_node, "nxp,sja1110-base-t1-mdio"); if (!np) return 0; --- - qca8k.yaml drivers/net/dsa/qca/qca8k-8xxx.c: - The DSA subdriver won't let the DSA driver register the bus. - No ds->ops->phy_read() or ds->ops->phy_write(). - Registers the bus non-OF-based or OF-based. Registers OF-based if "mdio" child node is defined. - mdio = of_get_child_by_name(priv->dev->of_node, "mdio"); --- - realtek.yaml drivers/net/dsa/realtek/realtek-smi.c: - The DSA subdriver won't let the DSA driver register the bus. Registers the bus OF-based only. Registering the bus is mandatory. Registers the bus when compatible string "realtek,smi-mdio" on a child node is defined. - mdio_np = of_get_compatible_child(priv->dev->of_node, "realtek,smi-mdio"); if (!mdio_np) return -ENODEV; ds->slave_mii_bus = priv->slave_mii_bus; drivers/net/dsa/realtek/realtek-mdio.c: - The DSA subdriver lets the DSA driver register the bus. --- - renesas,rzn1-a5psw.yaml drivers/net/dsa/rzn1_a5psw.c: - The DSA subdriver won't let the DSA driver register the bus. - No ds->ops->phy_read() or ds->ops->phy_write(). - Registers the bus OF-based only. Registers the bus when "mdio" child node is defined. - mdio = of_get_child_by_name(dev->of_node, "mdio"); if (of_device_is_available(mdio)) ret = a5psw_probe_mdio(a5psw, mdio); --- - ar9331.txt drivers/net/dsa/qca/ar9331.c: - The DSA subdriver won't let the DSA driver register the bus. - No ds->ops->phy_read() or ds->ops->phy_write(). - Registers the bus OF-based only. Registering the bus is mandatory. Registers the bus when "mdio" child node is defined. - mnp = of_get_child_by_name(np, "mdio"); if (!mnp) return -ENODEV; --- - lan9303.txt drivers/net/dsa/lan9303-core.c: - The DSA subdriver lets the DSA driver register the bus. --- - lantiq-gswip.txt drivers/net/dsa/lantiq_gswip.c: - The DSA subdriver won't let the DSA driver register the bus. - No ds->ops->phy_read() or ds->ops->phy_write(). - Registers the bus OF-based only. Registers the bus when compatible string "lantiq,xrx200-mdio" on a child node is defined. - mdio_np = of_get_compatible_child(dev->of_node, "lantiq,xrx200-mdio"); if (mdio_np) err = gswip_mdio(priv, mdio_np); --- - marvell.txt drivers/net/dsa/mv88e6xxx/chip.c: - The DSA subdriver won't let the DSA driver register the bus. - ds->slave_mii_bus = mv88e6xxx_default_mdio_bus(chip); - Registers the bus non-OF-based or OF-based. Registers OF-based if "mdio" child node is defined. --- - vitesse,vsc73xx.txt drivers/net/dsa/vitesse-vsc73xx-core.c: - The DSA subdriver lets the DSA driver register the bus. I will convert the non json-schema documents accordingly. Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com> --- .../devicetree/bindings/net/dsa/brcm,b53.yaml | 7 +++++++ .../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 7 +++++++ .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 7 +++++++ .../devicetree/bindings/net/dsa/microchip,lan937x.yaml | 3 +++ .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 3 ++- Documentation/devicetree/bindings/net/dsa/qca8k.yaml | 10 +++++----- Documentation/devicetree/bindings/net/dsa/realtek.yaml | 4 ++++ .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 3 +++ 8 files changed, 38 insertions(+), 6 deletions(-)