Commit 6390213b authored by Andrew Lunn's avatar Andrew Lunn Committed by Shawn Guo

ARM: dts: vf610: ZII: Add missing phy-mode and fixed links

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: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 62c9f9c1
...@@ -202,7 +202,7 @@ port@5 { ...@@ -202,7 +202,7 @@ port@5 {
port@6 { port@6 {
reg = <6>; reg = <6>;
label = "cpu"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
fixed-link { fixed-link {
......
...@@ -75,7 +75,7 @@ fixed-link { ...@@ -75,7 +75,7 @@ fixed-link {
port@6 { port@6 {
reg = <6>; reg = <6>;
label = "cpu"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
fixed-link { fixed-link {
......
...@@ -44,7 +44,7 @@ ports { ...@@ -44,7 +44,7 @@ ports {
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "cpu"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
fixed-link { fixed-link {
...@@ -82,6 +82,11 @@ switch0port10: port@10 { ...@@ -82,6 +82,11 @@ switch0port10: port@10 {
label = "dsa"; label = "dsa";
phy-mode = "xaui"; phy-mode = "xaui";
link = <&switch1port10>; link = <&switch1port10>;
fixed-link {
speed = <10000>;
full-duplex;
};
}; };
}; };
...@@ -174,6 +179,11 @@ switch1port10: port@10 { ...@@ -174,6 +179,11 @@ switch1port10: port@10 {
label = "dsa"; label = "dsa";
phy-mode = "xaui"; phy-mode = "xaui";
link = <&switch0port10>; link = <&switch0port10>;
fixed-link {
speed = <10000>;
full-duplex;
};
}; };
}; };
mdio { mdio {
......
...@@ -59,7 +59,7 @@ ports { ...@@ -59,7 +59,7 @@ ports {
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "cpu"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
fixed-link { fixed-link {
...@@ -115,6 +115,11 @@ switch0port10: port@10 { ...@@ -115,6 +115,11 @@ switch0port10: port@10 {
link = <&switch1port10 link = <&switch1port10
&switch3port10 &switch3port10
&switch2port10>; &switch2port10>;
fixed-link {
speed = <10000>;
full-duplex;
};
}; };
}; };
}; };
...@@ -156,6 +161,11 @@ switch1port9: port@9 { ...@@ -156,6 +161,11 @@ switch1port9: port@9 {
phy-mode = "xgmii"; phy-mode = "xgmii";
link = <&switch3port10 link = <&switch3port10
&switch2port10>; &switch2port10>;
fixed-link {
speed = <10000>;
full-duplex;
};
}; };
switch1port10: port@10 { switch1port10: port@10 {
...@@ -163,6 +173,11 @@ switch1port10: port@10 { ...@@ -163,6 +173,11 @@ switch1port10: port@10 {
label = "dsa"; label = "dsa";
phy-mode = "xgmii"; phy-mode = "xgmii";
link = <&switch0port10>; link = <&switch0port10>;
fixed-link {
speed = <10000>;
full-duplex;
};
}; };
}; };
}; };
...@@ -246,6 +261,11 @@ switch2port10: port@10 { ...@@ -246,6 +261,11 @@ switch2port10: port@10 {
link = <&switch3port9 link = <&switch3port9
&switch1port9 &switch1port9
&switch0port10>; &switch0port10>;
fixed-link {
speed = <2500>;
full-duplex;
};
}; };
}; };
}; };
...@@ -295,6 +315,11 @@ switch3port9: port@9 { ...@@ -295,6 +315,11 @@ switch3port9: port@9 {
label = "dsa"; label = "dsa";
phy-mode = "2500base-x"; phy-mode = "2500base-x";
link = <&switch2port10>; link = <&switch2port10>;
fixed-link {
speed = <2500>;
full-duplex;
};
}; };
switch3port10: port@10 { switch3port10: port@10 {
...@@ -303,6 +328,11 @@ switch3port10: port@10 { ...@@ -303,6 +328,11 @@ switch3port10: port@10 {
phy-mode = "xgmii"; phy-mode = "xgmii";
link = <&switch1port9 link = <&switch1port9
&switch0port10>; &switch0port10>;
fixed-link {
speed = <10000>;
full-duplex;
};
}; };
}; };
}; };
......
...@@ -140,7 +140,7 @@ ports { ...@@ -140,7 +140,7 @@ ports {
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "cpu"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
fixed-link { fixed-link {
......
...@@ -129,7 +129,7 @@ ports { ...@@ -129,7 +129,7 @@ ports {
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "cpu"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
fixed-link { fixed-link {
......
...@@ -154,7 +154,7 @@ ports { ...@@ -154,7 +154,7 @@ ports {
port@0 { port@0 {
reg = <0>; reg = <0>;
label = "cpu"; phy-mode = "rmii";
ethernet = <&fec1>; ethernet = <&fec1>;
fixed-link { fixed-link {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment