Merge tag 'mvebu-dt-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu into soc/dt

mvebu dt for 6.4 (part 1)

Add missing phy-mode and fixed links for kirkwood, orion5 and Armada
(370, XP, 38x) SoCs

* tag 'mvebu-dt-6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  ARM: dts: armada: Add missing phy-mode and fixed links
  ARM: dts: orion5: Add missing phy-mode and fixed links
  ARM: dts: kirkwood: Add missing phy-mode and fixed links

Link: https://lore.kernel.org/r/87edohzfeg.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <[email protected]>

Author: arndb

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;

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 {

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;
+				};
 			};
 
 		};

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;
+				};
 			};
 
 		};

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 {

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";
 

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>;

arch/arm/boot/dts/kirkwood-dir665.dts

@@ -232,7 +232,7 @@
 
 			port@6 {
 				reg = <6>;
-				label = "cpu";
+				phy-mode = "rgmii-id";
 				ethernet = <&eth0port>;
 				fixed-link {
 					speed = <1000>;
@@ -251,6 +251,7 @@
 	ethernet0-port@0 {
 		speed = <1000>;
 		duplex = <1>;
+		phy-mode = "rgmii";
 	};
 };
 

arch/arm/boot/dts/kirkwood-l-50.dts

@@ -254,7 +254,6 @@
 
 			port@6 {
 				reg = <6>;
-				label = "cpu";
 				phy-mode = "rgmii-id";
 				ethernet = <&eth1port>;
 				fixed-link {
@@ -330,6 +329,7 @@
 	ethernet1-port@0 {
 		speed = <1000>;
 		duplex = <1>;
+		phy-mode = "rgmii";
 	};
 };
 

arch/arm/boot/dts/kirkwood-linksys-viper.dts

@@ -198,7 +198,7 @@
 
 			port@5 {
 				reg = <5>;
-				label = "cpu";
+				phy-mode = "rgmii-id";
 				ethernet = <&eth0port>;
 				fixed-link {
 					speed = <1000>;
@@ -221,6 +221,7 @@
 	ethernet0-port@0 {
 		speed = <1000>;
 		duplex = <1>;
+		phy-mode = "rgmii";
 	};
 };