ARM: dts: kirkwood: 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 Kirkwood Ethernet is an RGMII port. Set the
switch to impose the RGMII delays.

Additionally, the cpu label has never actually been used in the
binding, so remove it.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/kirkwood-dir665.dts b/arch/arm/boot/dts/kirkwood-dir665.dts
index f9f4b01..0c0851c 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-dir665.dts
+++ b/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";
        };
 };
 

diff --git a/arch/arm/boot/dts/kirkwood-l-50.dts b/arch/arm/boot/dts/kirkwood-l-50.dts
index 60c1e94..9fd3581 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-l-50.dts
+++ b/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";
        };
 };
 

diff --git a/arch/arm/boot/dts/kirkwood-linksys-viper.dts b/arch/arm/boot/dts/kirkwood-linksys-viper.dts
index 2f9660f..27fd6e2 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-linksys-viper.dts
+++ b/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";
        };
 };
 

diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
index ced576a..5a77286 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -149,7 +149,7 @@
 
                        port@5 {
                                reg = <5>;
-                               label = "cpu";
+                               phy-mode = "rgmii-id";
                                ethernet = <&eth0port>;
                                fixed-link {
                                        speed = <1000>;
@@ -166,6 +166,7 @@
        ethernet0-port@0 {
                speed = <1000>;
                duplex = <1>;
+               phy-mode = "rgmii";
        };
 };
 

diff --git a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
index e21aa67..9d62f91 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-rd88f6281.dtsi
@@ -105,7 +105,7 @@
 
                        port@5 {
                                reg = <5>;
-                               label = "cpu";
+                               phy-mode = "rgmii-id";
                                ethernet = <&eth0port>;
                                fixed-link {
                                        speed = <1000>;