| Message ID | 20230412003746.2392518-1-andrew@lunn.ch (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | ARM: dts: vf610: ZII: Add missing phy-mode and fixed links | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Wed, Apr 12, 2023 at 02:37:46AM +0200, Andrew Lunn wrote: > The DSA framework has got more picky about always having a phy-mode > for the CPU port. The Vybrid FEC is a Fast Ethrnet using RMII. > > Additionally, the cpu label has never actually been used in the > binding, so remove it. > > Lastly, for DSA links between switches, add a fixed-link node > indicating the expected speed/duplex of the link. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > --- > arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 +- > arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- > arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 10 ++++++++- > arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 26 ++++++++++++++++++++++- > arch/arm/boot/dts/vf610-zii-spb4.dts | 2 +- > arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 2 +- > arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 +- > 7 files changed, 39 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts > index 96495d965163..b7bb2d6b3721 100644 > --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts > +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts > @@ -202,7 +202,7 @@ port@5 { > > port@6 { > reg = <6>; > - label = "cpu"; > + phy-mode = "rev-rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > index 6280c5e86a12..3f1bc7fc8526 100644 > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts > @@ -75,7 +75,7 @@ fixed-link { > > port@6 { > reg = <6>; > - label = "cpu"; > + phy-mode = "rev-rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > index c00d39562a10..811745077d2b 100644 > --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts > @@ -44,7 +44,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rev-rmii"; > ethernet = <&fec1>; > > fixed-link { > @@ -82,6 +82,10 @@ switch0port10: port@10 { > label = "dsa"; > phy-mode = "xaui"; > link = <&switch1port10>; > + fixed-link { Have a newline between properties and child node. Shawn > + speed = <10000>; > + full-duplex; > + }; > }; > }; > > @@ -174,6 +178,10 @@ switch1port10: port@10 { > label = "dsa"; > phy-mode = "xaui"; > link = <&switch0port10>; > + fixed-link { > + speed = <10000>; > + full-duplex; > + }; > }; > }; > mdio { > diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > index 7b3276cd470f..7959307f7d13 100644 > --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts > @@ -59,7 +59,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rev-rmii"; > ethernet = <&fec1>; > > fixed-link { > @@ -115,6 +115,10 @@ switch0port10: port@10 { > link = <&switch1port10 > &switch3port10 > &switch2port10>; > + fixed-link { > + speed = <10000>; > + full-duplex; > + }; > }; > }; > }; > @@ -156,6 +160,10 @@ switch1port9: port@9 { > phy-mode = "xgmii"; > link = <&switch3port10 > &switch2port10>; > + fixed-link { > + speed = <10000>; > + full-duplex; > + }; > }; > > switch1port10: port@10 { > @@ -163,6 +171,10 @@ switch1port10: port@10 { > label = "dsa"; > phy-mode = "xgmii"; > link = <&switch0port10>; > + fixed-link { > + speed = <10000>; > + full-duplex; > + }; > }; > }; > }; > @@ -246,6 +258,10 @@ switch2port10: port@10 { > link = <&switch3port9 > &switch1port9 > &switch0port10>; > + fixed-link { > + speed = <2500>; > + full-duplex; > + }; > }; > }; > }; > @@ -295,6 +311,10 @@ switch3port9: port@9 { > label = "dsa"; > phy-mode = "2500base-x"; > link = <&switch2port10>; > + fixed-link { > + speed = <2500>; > + full-duplex; > + }; > }; > > switch3port10: port@10 { > @@ -303,6 +323,10 @@ switch3port10: port@10 { > phy-mode = "xgmii"; > link = <&switch1port9 > &switch0port10>; > + fixed-link { > + speed = <10000>; > + full-duplex; > + }; > }; > }; > }; > diff --git a/arch/arm/boot/dts/vf610-zii-spb4.dts b/arch/arm/boot/dts/vf610-zii-spb4.dts > index 180acb0795b9..3f9687953f57 100644 > --- a/arch/arm/boot/dts/vf610-zii-spb4.dts > +++ b/arch/arm/boot/dts/vf610-zii-spb4.dts > @@ -140,7 +140,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rev-rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > index 73fdace4cb42..d06a074bfe21 100644 > --- a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts > @@ -129,7 +129,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rev-rmii"; > ethernet = <&fec1>; > > fixed-link { > diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > index 20beaa8433b6..c60639beda40 100644 > --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts > @@ -154,7 +154,7 @@ ports { > > port@0 { > reg = <0>; > - label = "cpu"; > + phy-mode = "rev-rmii"; > ethernet = <&fec1>; > > fixed-link { > -- > 2.40.0 >
diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts index 96495d965163..b7bb2d6b3721 100644 --- a/arch/arm/boot/dts/vf610-zii-cfu1.dts +++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts @@ -202,7 +202,7 @@ port@5 { port@6 { reg = <6>; - label = "cpu"; + phy-mode = "rev-rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts index 6280c5e86a12..3f1bc7fc8526 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts @@ -75,7 +75,7 @@ fixed-link { port@6 { reg = <6>; - label = "cpu"; + phy-mode = "rev-rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts index c00d39562a10..811745077d2b 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts @@ -44,7 +44,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rev-rmii"; ethernet = <&fec1>; fixed-link { @@ -82,6 +82,10 @@ switch0port10: port@10 { label = "dsa"; phy-mode = "xaui"; link = <&switch1port10>; + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; @@ -174,6 +178,10 @@ switch1port10: port@10 { label = "dsa"; phy-mode = "xaui"; link = <&switch0port10>; + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; mdio { diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts index 7b3276cd470f..7959307f7d13 100644 --- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts +++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts @@ -59,7 +59,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rev-rmii"; ethernet = <&fec1>; fixed-link { @@ -115,6 +115,10 @@ switch0port10: port@10 { link = <&switch1port10 &switch3port10 &switch2port10>; + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; }; @@ -156,6 +160,10 @@ switch1port9: port@9 { phy-mode = "xgmii"; link = <&switch3port10 &switch2port10>; + fixed-link { + speed = <10000>; + full-duplex; + }; }; switch1port10: port@10 { @@ -163,6 +171,10 @@ switch1port10: port@10 { label = "dsa"; phy-mode = "xgmii"; link = <&switch0port10>; + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; }; @@ -246,6 +258,10 @@ switch2port10: port@10 { link = <&switch3port9 &switch1port9 &switch0port10>; + fixed-link { + speed = <2500>; + full-duplex; + }; }; }; }; @@ -295,6 +311,10 @@ switch3port9: port@9 { label = "dsa"; phy-mode = "2500base-x"; link = <&switch2port10>; + fixed-link { + speed = <2500>; + full-duplex; + }; }; switch3port10: port@10 { @@ -303,6 +323,10 @@ switch3port10: port@10 { phy-mode = "xgmii"; link = <&switch1port9 &switch0port10>; + fixed-link { + speed = <10000>; + full-duplex; + }; }; }; }; diff --git a/arch/arm/boot/dts/vf610-zii-spb4.dts b/arch/arm/boot/dts/vf610-zii-spb4.dts index 180acb0795b9..3f9687953f57 100644 --- a/arch/arm/boot/dts/vf610-zii-spb4.dts +++ b/arch/arm/boot/dts/vf610-zii-spb4.dts @@ -140,7 +140,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rev-rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts index 73fdace4cb42..d06a074bfe21 100644 --- a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts +++ b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts @@ -129,7 +129,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rev-rmii"; ethernet = <&fec1>; fixed-link { diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts index 20beaa8433b6..c60639beda40 100644 --- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts +++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts @@ -154,7 +154,7 @@ ports { port@0 { reg = <0>; - label = "cpu"; + phy-mode = "rev-rmii"; ethernet = <&fec1>; fixed-link {
The DSA framework has got more picky about always having a phy-mode for the CPU port. The Vybrid FEC is a Fast Ethrnet using RMII. Additionally, the cpu label has never actually been used in the binding, so remove it. Lastly, for DSA links between switches, add a fixed-link node indicating the expected speed/duplex of the link. Signed-off-by: Andrew Lunn <andrew@lunn.ch> --- arch/arm/boot/dts/vf610-zii-cfu1.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 10 ++++++++- arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 26 ++++++++++++++++++++++- arch/arm/boot/dts/vf610-zii-spb4.dts | 2 +- arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 2 +- arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 +- 7 files changed, 39 insertions(+), 7 deletions(-)