Skip to content

Commit 0939de7

Browse files
lunngclement
authored andcommitted
ARM: dts: armada: 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 Armada Ethernet supports RGMII, SGMII, 1000base-x and 2500Base-X. Set the switch phy-mode based on how the SoC Ethernet ports is been configured. For RGMII mode, have the switch add the delays. Additionally, the cpu label has never actually been used in the binding, so remove it. Lastly, add a fixed-link node indicating the expected speed/duplex of the link to the SoC. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Gregory CLEMENT <[email protected]>
1 parent e2e1bcb commit 0939de7

7 files changed

+16
-8
lines changed

arch/arm/boot/dts/armada-370-rd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,8 +171,8 @@
171171

172172
port@5 {
173173
reg = <5>;
174-
label = "cpu";
175174
ethernet = <&eth1>;
175+
phy-mode = "rgmii-id";
176176
fixed-link {
177177
speed = <1000>;
178178
full-duplex;

arch/arm/boot/dts/armada-381-netgear-gs110emx.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148

149149
port@0 {
150150
ethernet = <&eth0>;
151-
label = "cpu";
151+
phy-mode = "rgmii";
152152
reg = <0>;
153153

154154
fixed-link {

arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,13 @@
6868

6969
port@10 {
7070
reg = <10>;
71-
label = "cpu";
71+
phy-mode = "2500base-x";
72+
7273
ethernet = <&eth1>;
74+
fixed-link {
75+
speed = <2500>;
76+
full-duplex;
77+
};
7378
};
7479

7580
};

arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@
4848

4949
port@5 {
5050
reg = <5>;
51-
label = "cpu";
51+
phy-mode = "2500base-x";
5252
ethernet = <&eth1>;
53+
54+
fixed-link {
55+
speed = <2500>;
56+
full-duplex;
57+
};
5358
};
5459

5560
};

arch/arm/boot/dts/armada-385-linksys.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@
195195

196196
port@5 {
197197
reg = <5>;
198-
label = "cpu";
198+
phy-mode = "sgmii";
199199
ethernet = <&eth2>;
200200

201201
fixed-link {

arch/arm/boot/dts/armada-385-turris-omnia.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,6 @@
479479

480480
ports@5 {
481481
reg = <5>;
482-
label = "cpu";
483482
ethernet = <&eth1>;
484483
phy-mode = "rgmii-id";
485484

@@ -491,7 +490,6 @@
491490

492491
ports@6 {
493492
reg = <6>;
494-
label = "cpu";
495493
ethernet = <&eth0>;
496494
phy-mode = "rgmii-id";
497495

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@
302302

303303
port@5 {
304304
reg = <5>;
305-
label = "cpu";
305+
phy-mode = "rgmii-id";
306306
ethernet = <&eth0>;
307307
fixed-link {
308308
speed = <1000>;

0 commit comments

Comments
 (0)