ARM: dts: vf610: ZII: 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 Vybrid FEC is a Fast Ethrnet using RMII.

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

Lastly, for DSA links between switches, add a fixed-link node
indicating the expected speed/duplex of the link.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/vf610-zii-cfu1.dts b/arch/arm/boot/dts/vf610-zii-cfu1.dts
index 96495d965163569483860930d1f3ac748936878b..1a19aec8957b744e4254931e8527d9829b5a70ac 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-cfu1.dts
+++ b/arch/arm/boot/dts/vf610-zii-cfu1.dts
@@ -202,7 +202,7 @@
 
                                port@6 {
                                        reg = <6>;
-                                       label = "cpu";
+                                       phy-mode = "rmii";
                                        ethernet = <&fec1>;
 
                                        fixed-link {

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
index 1fafefec7741007e6f1226272254e1f2759d5f01..16b4e06c4efad36e5a811d17cdafcb4753559b0a 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-b.dts
@@ -75,7 +75,7 @@
 
                                        port@6 {
                                                reg = <6>;
-                                               label = "cpu";
+                                               phy-mode = "rmii";
                                                ethernet = <&fec1>;
 
                                                fixed-link {

diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
index c00d39562a10bb9487785b8f77f5fb181fc0cb90..6f9878f124c44b49fce78f8026f733907da8c1c4 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
+++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts
@@ -44,7 +44,7 @@
 
                                        port@0 {
                                                reg = <0>;
-                                               label = "cpu";
+                                               phy-mode = "rmii";
                                                ethernet = <&fec1>;
 
                                                fixed-link {
@@ -82,6 +82,11 @@
                                                label = "dsa";
                                                phy-mode = "xaui";
                                                link = <&switch1port10>;
+
+                                               fixed-link {
+                                                       speed = <10000>;
+                                                       full-duplex;
+                                               };
                                        };
                                };
 
@@ -174,6 +179,11 @@
                                                label = "dsa";
                                                phy-mode = "xaui";
                                                link = <&switch0port10>;
+
+                                               fixed-link {
+                                                       speed = <10000>;
+                                                       full-duplex;
+                                               };
                                        };
                                };
                                mdio {

diff --git a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
index 7b3276cd470fbd54f57610041b64979bb6379e65..df1335492a199841483dc9facd40834fab48003c 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+++ b/arch/arm/boot/dts/vf610-zii-scu4-aib.dts
@@ -59,7 +59,7 @@
 
                                        port@0 {
                                                reg = <0>;
-                                               label = "cpu";
+                                               phy-mode = "rmii";
                                                ethernet = <&fec1>;
 
                                                fixed-link {
@@ -115,6 +115,11 @@
                                                link = <&switch1port10
                                                        &switch3port10
                                                        &switch2port10>;
+
+                                               fixed-link {
+                                                       speed = <10000>;
+                                                       full-duplex;
+                                               };
                                        };
                                };
                        };
@@ -156,6 +161,11 @@
                                                phy-mode = "xgmii";
                                                link = <&switch3port10
                                                        &switch2port10>;
+
+                                               fixed-link {
+                                                       speed = <10000>;
+                                                       full-duplex;
+                                               };
                                        };
 
                                        switch1port10: port@10 {
@@ -163,6 +173,11 @@
                                                label = "dsa";
                                                phy-mode = "xgmii";
                                                link = <&switch0port10>;
+
+                                               fixed-link {
+                                                       speed = <10000>;
+                                                       full-duplex;
+                                               };
                                        };
                                };
                        };
@@ -246,6 +261,11 @@
                                                link = <&switch3port9
                                                        &switch1port9
                                                        &switch0port10>;
+
+                                               fixed-link {
+                                                       speed = <2500>;
+                                                       full-duplex;
+                                               };
                                        };
                                };
                        };
@@ -295,6 +315,11 @@
                                                label = "dsa";
                                                phy-mode = "2500base-x";
                                                link = <&switch2port10>;
+
+                                               fixed-link {
+                                                       speed = <2500>;
+                                                       full-duplex;
+                                               };
                                        };
 
                                        switch3port10: port@10 {
@@ -303,6 +328,11 @@
                                                phy-mode = "xgmii";
                                                link = <&switch1port9
                                                        &switch0port10>;
+
+                                               fixed-link {
+                                                       speed = <10000>;
+                                                       full-duplex;
+                                               };
                                        };
                                };
                        };

diff --git a/arch/arm/boot/dts/vf610-zii-spb4.dts b/arch/arm/boot/dts/vf610-zii-spb4.dts
index 180acb0795b9e6fea995053c76c67805ecbff8ef..1461804ecaea3b74bf438663b82663aa8b087104 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-spb4.dts
+++ b/arch/arm/boot/dts/vf610-zii-spb4.dts
@@ -140,7 +140,7 @@
 
                                port@0 {
                                        reg = <0>;
-                                       label = "cpu";
+                                       phy-mode = "rmii";
                                        ethernet = <&fec1>;
 
                                        fixed-link {

diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts
index 73fdace4cb42470b33aa9593a3cfb4792cc5ad69..463c2452b9b7f9e6ee02b0a8dcb90b415d64a171 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts
+++ b/arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts
@@ -129,7 +129,7 @@
 
                                port@0 {
                                        reg = <0>;
-                                       label = "cpu";
+                                       phy-mode = "rmii";
                                        ethernet = <&fec1>;
 
                                        fixed-link {

diff --git a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
index 20beaa8433b6cee26fa7c44c804579a927f29a44..f5ae0d5de31517374a5223518a8de924df1eaa03 100644 (file)
--- a/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
+++ b/arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts
@@ -154,7 +154,7 @@
 
                                port@0 {
                                        reg = <0>;
-                                       label = "cpu";
+                                       phy-mode = "rmii";
                                        ethernet = <&fec1>;
 
                                        fixed-link {