lantiq: xrx200: use vlan for ethernet wan port

Using the lantiq,wan device tree property for one interface node and
the lantiq,switch device tree property for another interface node at
the same time was never intended/isn't supported at the moment.

The property is meant to be used in two phy operation mode where one
phy is assigned to an interface without lantiq,* device tree property
and the other phy is assigned to an interface with the lantiq,wan
device property to have two netdevs.

If both properties are used at the same time, the lantiq,wan interface
is shown as independent netdev but not able to operate independent. The
port needs to be managed via swconfig. These dependency is not obvious
and fooled already a lot of users.

Add a default WAN vlan for xrx200 devices having an ethernet WAN port
and remove the lantiq,wan device tree property. Leave it up to the user
to set the ethernet WAN port as default WAN interface or to use this
port as additional LAN port.

Signed-off-by: Mathias Kresin <dev@kresin.me>

diff --git a/target/linux/lantiq/base-files/etc/board.d/02_network b/target/linux/lantiq/base-files/etc/board.d/02_network
index 6140a160355cbe3ba5b1d4a3e617596715712a19..ff62c442193417d1d3305cc5893ad52cc9839bb4 100755 (executable)
--- a/target/linux/lantiq/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/base-files/etc/board.d/02_network
@@ -78,7 +78,7 @@ BTHOMEHUBV5A)
        lan_mac=$(mtd_get_mac_binary_ubi caldata 4364)
        wan_mac=$(macaddr_add "$lan_mac" 1)
        ucidef_add_switch "switch0" \
-               "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "6t@eth0"
+               "0:lan:3" "1:lan:4" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
        ;;
 
 DGN3500*)
@@ -146,13 +146,13 @@ VR200v)
 VGV7510KW22*)
        wan_mac=$(macaddr_add "$(mtd_get_mac_binary board_config 22)" 2)
        ucidef_add_switch "switch0" \
-               "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "6t@eth0"
+               "2:lan:2" "3:lan:1" "4:lan:4" "5:lan:3" "0:wan:5" "6t@eth0"
        ;;
 
 VGV7519*)
        wan_mac=$(mtd_get_mac_binary board_config 22)
        ucidef_add_switch "switch0" \
-               "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "6t@eth0"
+               "0:lan:4" "1:lan:3" "2:lan:2" "4:lan:1" "5:wan:5" "6t@eth0"
        ;;
 
 WBMR)

diff --git a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
index 7f19e5291ff49c31da3703bd296dba0535997148..59b6cee9b80874a7656e1def1034d0a3f355cf39 100644 (file)
--- a/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
+++ b/target/linux/lantiq/dts/BTHOMEHUBV5A.dts
@@ -244,15 +244,6 @@
                        phy-mode = "gmii";
                        phy-handle = <&phy13>;
                };
-       };
-
-       wan: interface@1 {
-               compatible = "lantiq,xrx200-pdi";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <1>;
-               lantiq,wan;
-
                ethernet@5 {
                        compatible = "lantiq,xrx200-pdi-port";
                        reg = <5>;

diff --git a/target/linux/lantiq/dts/VGV7510KW22.dtsi b/target/linux/lantiq/dts/VGV7510KW22.dtsi
index fa46e07670776ce553aeb1c084b06adfa22baf0d..cb1707e1832aed39213632de8bc832e0902055bd 100644 (file)
--- a/target/linux/lantiq/dts/VGV7510KW22.dtsi
+++ b/target/linux/lantiq/dts/VGV7510KW22.dtsi
@@ -189,6 +189,12 @@
                mtd-mac-address = <&boardconfig 0x16>;
                lantiq,switch;
 
+               ethernet@0 {
+                       compatible = "lantiq,xrx200-pdi-port";
+                       reg = <0>;
+                       phy-mode = "mii";
+                       phy-handle = <&phy1>;
+               };
                ethernet@2 {
                        compatible = "lantiq,xrx200-pdi-port";
                        reg = <2>;
@@ -215,23 +221,6 @@
                };
        };
 
-       wan: interface@1 {
-               compatible = "lantiq,xrx200-pdi";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <1>;
-               mtd-mac-address = <&boardconfig 0x16>;
-               mtd-mac-address-increment = <3>;
-               lantiq,wan;
-
-               ethernet@0 {
-                       compatible = "lantiq,xrx200-pdi-port";
-                       reg = <0>;
-                       phy-mode = "mii";
-                       phy-handle = <&phy1>;
-               };
-       };
-
        mdio@0 {
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/target/linux/lantiq/dts/VGV7519.dtsi b/target/linux/lantiq/dts/VGV7519.dtsi
index 9080d8d99780bfc8425ea44c30ccdca7b879ef67..93d5a9473afd9306d4081fddbe5f122f58e6a7dc 100644 (file)
--- a/target/linux/lantiq/dts/VGV7519.dtsi
+++ b/target/linux/lantiq/dts/VGV7519.dtsi
@@ -260,16 +260,6 @@
                        phy-mode = "gmii";
                        phy-handle = <&phy13>;
                };
-       };
-
-       wan: interface@1 {
-               compatible = "lantiq,xrx200-pdi";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               reg = <1>;
-               mtd-mac-address = <&boardconfig 0x16>;
-               lantiq,wan;
-
                ethernet@5 {
                        compatible = "lantiq,xrx200-pdi-port";
                        reg = <5>;