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 be005c9..2fce8e7 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 095df55..f4c4b21 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 c9ac630..1990f7d 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 fa653b3..b795ad5 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 85e8d96..fc8216f 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 0c1f238..2d8d319 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 dbe8dfe..7a0614f 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>;