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 <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index be005c9f42ef350cac0076f4ae5e5c8d5fa79eda..2fce8e794265c6329a3758147e5c149888ce945b 100644 (file)
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -171,8 +171,8 @@
 
                        port@5 {
                                reg = <5>;
-                               label = "cpu";
                                ethernet = <&eth1>;
+                               phy-mode = "rgmii-id";
                                fixed-link {
                                        speed = <1000>;
                                        full-duplex;

diff --git a/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts b/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts
index 095df5567c931d546edab51619ffe8f0910d2782..f4c4b213ef4ed6cdf5243031146603245c1e3e20 100644 (file)
--- a/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts
+++ b/arch/arm/boot/dts/armada-381-netgear-gs110emx.dts
@@ -148,7 +148,7 @@
 
                        port@0 {
                                ethernet = <&eth0>;
-                               label = "cpu";
+                               phy-mode = "rgmii";
                                reg = <0>;
 
                                fixed-link {

diff --git a/arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts b/arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts
index c9ac630e5874b4f4da233ec55b7a7614d605e65b..1990f7d0cc79a72c41796756d53af9142129f972 100644 (file)
--- a/arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts
+++ b/arch/arm/boot/dts/armada-385-clearfog-gtr-l8.dts
@@ -68,8 +68,13 @@
 
                        port@10 {
                                reg = <10>;
-                               label = "cpu";
+                               phy-mode = "2500base-x";
+
                                ethernet = <&eth1>;
+                               fixed-link {
+                                       speed = <2500>;
+                                       full-duplex;
+                               };
                        };
 
                };

diff --git a/arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts b/arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts
index fa653b3794901719aa9d42325bb76fe530633e40..b795ad573891ea0e096822e828e18db403a8b02c 100644 (file)
--- a/arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts
+++ b/arch/arm/boot/dts/armada-385-clearfog-gtr-s4.dts
@@ -48,8 +48,13 @@
 
                        port@5 {
                                reg = <5>;
-                               label = "cpu";
+                               phy-mode = "2500base-x";
                                ethernet = <&eth1>;
+
+                               fixed-link {
+                                       speed = <2500>;
+                                       full-duplex;
+                               };
                        };
 
                };

diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
index 85e8d966f6c1fc8389b41a1d61b5f421e1d17317..fc8216fd9f60092603bf2ef612b12cb683468c8e 100644 (file)
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -195,7 +195,7 @@
 
                        port@5 {
                                reg = <5>;
-                               label = "cpu";
+                               phy-mode = "sgmii";
                                ethernet = <&eth2>;
 
                                fixed-link {

diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts
index 0c1f238e4c3061b1965e224ef50d5bddb4547f4c..2d8d319bec83000f1561648c1f3ec47d5b172d2f 100644 (file)
--- a/arch/arm/boot/dts/armada-385-turris-omnia.dts
+++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
@@ -479,7 +479,6 @@
 
                        ports@5 {
                                reg = <5>;
-                               label = "cpu";
                                ethernet = <&eth1>;
                                phy-mode = "rgmii-id";
 
@@ -491,7 +490,6 @@
 
                        ports@6 {
                                reg = <6>;
-                               label = "cpu";
                                ethernet = <&eth0>;
                                phy-mode = "rgmii-id";
 

diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index dbe8dfe236fbeedd88e639e6d88ef0212e35960d..7a0614fd0c93ad6e4a8e78a89379ebe2c732c940 100644 (file)
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -302,7 +302,7 @@
 
                        port@5 {
                                reg = <5>;
-                               label = "cpu";
+                               phy-mode = "rgmii-id";
                                ethernet = <&eth0>;
                                fixed-link {
                                        speed = <1000>;