ARM: dts: armada388-clearfog: add missing phy-modes

The DSA framework has got more picky about always having a phy-mode,
particularly for the CPU port. Add the missing phy-mode properties
for every port which does not have an integrated PHY.

Add a phy-mode property to the ethernet interface facing the switch
as this was configured using SGMII - as the switch is actually
using 1000base-x, let's have some consistency between the two link
partners.

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

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>

diff --git a/arch/arm/boot/dts/armada-388-clearfog.dts b/arch/arm/boot/dts/armada-388-clearfog.dts
index 9529916..32c569d 100644 (file)
--- a/arch/arm/boot/dts/armada-388-clearfog.dts
+++ b/arch/arm/boot/dts/armada-388-clearfog.dts
@@ -47,6 +47,8 @@
 
 &eth1 {
        /* ethernet@30000 */
+       phy-mode = "1000base-x";
+
        fixed-link {
                speed = <1000>;
                full-duplex;
@@ -129,8 +131,9 @@
 
                        port@5 {
                                reg = <5>;
-                               label = "cpu";
                                ethernet = <&eth1>;
+                               phy-mode = "1000base-x";
+
                                fixed-link {
                                        speed = <1000>;
                                        full-duplex;
@@ -141,6 +144,8 @@
                                /* 88E1512 external phy */
                                reg = <6>;
                                label = "lan6";
+                               phy-mode = "rgmii-id";
+
                                fixed-link {
                                        speed = <1000>;
                                        full-duplex;