ipq40xx: fix ZTE MF289F port mapping

With initial support, the mapping of LAN1/WAN and LAN2 ports was
swapped. Fix it to match labels on the device, keeping the "WAN"
personality of the first port - in line with current state of DSA setup
in master for this device.

Tested-by: Marcin Gajda <mgajda@o2.pl>
Tested-by: Christian Heuff <christian@heuff.at>
Signed-off-by: Lech Perczak <lech.perczak@gmail.com>

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index deb9ec64f6a78722f845d1180fac5f73b8687c0c..a38d35a10dcf30e19e2e29a1a3ea1a6f4539afdb 100644 (file)
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -153,7 +153,7 @@ ipq40xx_setup_interfaces()
        zte,mf289f)
                ucidef_set_interfaces_lan_wan "eth0" "eth1"
                ucidef_add_switch "switch0" \
-                       "0u@eth0" "0u@eth1" "2:lan:1" "5:lan:2"
+                               "0u@eth0" "5:lan:2" "0u@eth1" "2:wan"
                ;;
        *)
                echo "Unsupported hardware. Network interfaces not initialized"

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
index 41cd46710c6d37ac8f9c5dec4b6ef8bc79eb8bdc..3f16b56a55c28ed2130d0f7fe8e612ddf955dee0 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-mf289f.dts
@@ -103,6 +103,8 @@
 
                ess-switch@c000000 {
                        status = "okay";
+                       switch_lan_bmp = <0x20>;
+                       switch_wan_bmp = <0x4>;
                };
 
                edma@c080000 {
@@ -322,12 +324,14 @@
 &gmac0 {
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_mac_0>;
+       vlan_tag = <1 0x20>;
 };
 
 &gmac1 {
        nvmem-cell-names = "mac-address";
        nvmem-cells = <&macaddr_mac_0>;
        mac-address-increment = <1>;
+       vlan_tag = <2 0x4>;
 };