lantiq: xrx200: switch the subtarget to the mainline DSA driver

Enable the XRX200 PMAC, GSWIP DSA tag and GSIP DSA drivers in the 5.4
kernel config. Update the existing vr9_*.dts{,i} to use the new
Ethernet and switch drivers. Drop the swconfig package from the xrx200
target because swconfig doesn't manage DSA based switches.

The new /etc/config/network format for the DSA driver is not compatible
with the old (swconfig) based one. Show a message during sysupgrade
notifying users about this change and asking them to start with a fresh
config (or forcefully update and then migrate the config manually).

Failsafe mode can now automatically bring up the first lan interface
based on board.json including DSA based setups. Drop
05_set_preinit_iface_lantiq from the xRX200 sub-target as this is not
needed anymore. For now we are keeping it for the ase, xway and
xway_legacy until there's some confirmation that it can be dropped from
there as well.

While here, some boards also receive minor fixups:
- Use LAN1 as LAN1 (according to a photo this port can also be
  configured as WAN) on the Buffalo WBMR-300HPD. This makes it easier to
  read the port mapping because otherwise we would have LAN{2,3,4} and
  WAN (which was the case for the non-DSA version previously).
- vr9_avm_fritz3390.dts: move the "gpio" comment from port 0 and 1 to
  their corresponding PHYs
- vr9_tplink_vr200.dtsi: move the "gpio" comment from port 0 to PHY 0
- vr9_tplink_tdw89x0.dtsi: move the "gpio" comment from port 0 to PHY 0

Acked-by: Aleksander Jan Bajkowski <A.Bajkowski@stud.elka.pw.edu.pl>
Tested-by: Notupus <notpp46@googlemail.com> # TD-W9980/DM200/FRITZ 7430
Tested-by: Martin Schiller <ms@dev.tdt.de> # tested on TDT VR2020
Tested-by: Martin Schiller <ms@dev.tdt.de> # tested on TP-Link TD-W8980B
Tested-by: Martin Schiller <ms@dev.tdt.de> # tested on ZyXEL P-2812HNU-F1
Tested-by: Daniel Kestrel <kestrel1974@t-online.de> # tested on Fritzbox 7490
Tested-by: Daniel Kestrel <kestrel1974@t-online.de> # tested on Fritzbox 3490
Tested-by: @jospezial <jospezial@gmx.de> # tested on VGV7510KW22 (o2 Box 6431)
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

2 files changed, 37 insertions, 0 deletions

diff --git a/target/linux/lantiq/image/tp-link.mk b/target/linux/lantiq/image/tp-link.mk
index cebdf46e12..e269aacd02 100644
--- a/target/linux/lantiq/image/tp-link.mk
+++ b/target/linux/lantiq/image/tp-link.mk
@@ -1,5 +1,10 @@
 DEVICE_VARS += TPLINK_FLASHLAYOUT TPLINK_HWID TPLINK_HWREV TPLINK_HWREVADD TPLINK_HVERSION
 
+define Device/dsa-migration
+  DEVICE_COMPAT_VERSION := 1.1
+  DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
+endef
+
 define Device/lantiqTpLink
   DEVICE_VENDOR := TP-Link
   TPLINK_HWREVADD := 0
@@ -13,6 +18,7 @@ define Device/lantiqTpLink
 endef
 
 define Device/tplink_tdw8970
+  $(Device/dsa-migration)
   $(Device/lantiqTpLink)
   DEVICE_MODEL := TD-W8970
   DEVICE_VARIANT := v1
@@ -26,6 +32,7 @@ endef
 TARGET_DEVICES += tplink_tdw8970
 
 define Device/tplink_tdw8980
+  $(Device/dsa-migration)
   $(Device/lantiqTpLink)
   DEVICE_MODEL := TD-W8980
   DEVICE_VARIANT := v1
@@ -39,6 +46,7 @@ endef
 TARGET_DEVICES += tplink_tdw8980
 
 define Device/tplink_vr200
+  $(Device/dsa-migration)
   $(Device/lantiqTpLink)
   DEVICE_MODEL := Archer VR200
   DEVICE_VARIANT := v1
@@ -52,6 +60,7 @@ endef
 TARGET_DEVICES += tplink_vr200
 
 define Device/tplink_vr200v
+  $(Device/dsa-migration)
   $(Device/lantiqTpLink)
   DEVICE_MODEL := Archer VR200v
   DEVICE_VARIANT := v1
diff --git a/target/linux/lantiq/image/vr9.mk b/target/linux/lantiq/image/vr9.mk
index d8cabea972..5bc31314f8 100644
--- a/target/linux/lantiq/image/vr9.mk
+++ b/target/linux/lantiq/image/vr9.mk
@@ -1,6 +1,12 @@
 DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 
+define Device/dsa-migration
+  DEVICE_COMPAT_VERSION := 1.1
+  DEVICE_COMPAT_MESSAGE := Config cannot be migrated from swconfig to DSA
+endef
+
 define Device/alphanetworks_asl56026
+  $(Device/dsa-migration)
   DEVICE_VENDOR := Alpha
   DEVICE_MODEL := ASL56026
   DEVICE_ALT0_VENDOR := BT Openreach
@@ -10,6 +16,7 @@ endef
 TARGET_DEVICES += alphanetworks_asl56026
 
 define Device/arcadyan_arv7519rw22
+  $(Device/dsa-migration)
   DEVICE_VENDOR := Arcadyan
   DEVICE_MODEL := ARV7519RW22
   DEVICE_ALT0_VENDOR := Orange
@@ -26,6 +33,7 @@ endef
 TARGET_DEVICES += arcadyan_arv7519rw22
 
 define Device/arcadyan_vg3503j
+  $(Device/dsa-migration)
   DEVICE_VENDOR := BT Openreach
   DEVICE_MODEL := ECI VDSL Modem V-2FUb/R
   IMAGE_SIZE := 8000k
@@ -34,6 +42,7 @@ endef
 TARGET_DEVICES += arcadyan_vg3503j
 
 define Device/arcadyan_vgv7510kw22-brn
+  $(Device/dsa-migration)
   $(Device/lantiqBrnImage)
   DEVICE_VENDOR := Arcadyan
   DEVICE_MODEL := VGV7510KW22
@@ -51,6 +60,7 @@ endef
 TARGET_DEVICES += arcadyan_vgv7510kw22-brn
 
 define Device/arcadyan_vgv7510kw22-nor
+  $(Device/dsa-migration)
   DEVICE_VENDOR := Arcadyan
   DEVICE_MODEL := VGV7510KW22
   DEVICE_VARIANT := NOR
@@ -64,6 +74,7 @@ endef
 TARGET_DEVICES += arcadyan_vgv7510kw22-nor
 
 define Device/arcadyan_vgv7519-brn
+  $(Device/dsa-migration)
   $(Device/lantiqBrnImage)
   DEVICE_VENDOR := Arcadyan
   DEVICE_MODEL := VGV7519
@@ -81,6 +92,7 @@ endef
 TARGET_DEVICES += arcadyan_vgv7519-brn
 
 define Device/arcadyan_vgv7519-nor
+  $(Device/dsa-migration)
   DEVICE_VENDOR := Arcadyan
   DEVICE_MODEL := VGV7519
   DEVICE_VARIANT := NOR
@@ -94,6 +106,7 @@ endef
 TARGET_DEVICES += arcadyan_vgv7519-nor
 
 define Device/avm_fritz3370
+  $(Device/dsa-migration)
   $(Device/AVM)
   $(Device/NAND)
   DEVICE_MODEL := FRITZ!Box 3370
@@ -107,6 +120,7 @@ define Device/avm_fritz3370
 endef
 
 define Device/avm_fritz3370-rev2-hynix
+  $(Device/dsa-migration)
   $(Device/avm_fritz3370)
   DEVICE_MODEL := FRITZ!Box 3370
   DEVICE_VARIANT := Rev. 2 (Hynix NAND)
@@ -114,6 +128,7 @@ endef
 TARGET_DEVICES += avm_fritz3370-rev2-hynix
 
 define Device/avm_fritz3370-rev2-micron
+  $(Device/dsa-migration)
   $(Device/avm_fritz3370)
   DEVICE_MODEL := FRITZ!Box 3370
   DEVICE_VARIANT := Rev. 2 (Micron NAND)
@@ -121,6 +136,7 @@ endef
 TARGET_DEVICES += avm_fritz3370-rev2-micron
 
 define Device/avm_fritz3390
+  $(Device/dsa-migration)
   $(Device/AVM)
   $(Device/NAND)
   DEVICE_MODEL := FRITZ!Box 3390
@@ -132,6 +148,7 @@ endef
 TARGET_DEVICES += avm_fritz3390
 
 define Device/avm_fritz7360sl
+  $(Device/dsa-migration)
   $(Device/AVM)
   DEVICE_MODEL := FRITZ!Box 7360 SL
   IMAGE_SIZE := 15744k
@@ -141,6 +158,7 @@ endef
 TARGET_DEVICES += avm_fritz7360sl
 
 define Device/avm_fritz7360-v2
+  $(Device/dsa-migration)
   $(Device/AVM)
   DEVICE_MODEL := FRITZ!Box 7360
   DEVICE_VARIANT := v2
@@ -150,6 +168,7 @@ endef
 TARGET_DEVICES += avm_fritz7360-v2
 
 define Device/avm_fritz7362sl
+  $(Device/dsa-migration)
   $(Device/AVM)
   $(Device/NAND)
   DEVICE_MODEL := FRITZ!Box 7362 SL
@@ -160,6 +179,7 @@ endef
 TARGET_DEVICES += avm_fritz7362sl
 
 define Device/avm_fritz7412
+  $(Device/dsa-migration)
   $(Device/AVM)
   $(Device/NAND)
   DEVICE_MODEL := FRITZ!Box 7412
@@ -171,6 +191,7 @@ endef
 TARGET_DEVICES += avm_fritz7412
 
 define Device/avm_fritz7430
+  $(Device/dsa-migration)
   $(Device/AVM)
   $(Device/NAND)
   DEVICE_MODEL := FRITZ!Box 7430
@@ -181,6 +202,7 @@ endef
 TARGET_DEVICES += avm_fritz7430
 
 define Device/bt_homehub-v5a
+  $(Device/dsa-migration)
   $(Device/NAND)
   DEVICE_VENDOR := British Telecom
   DEVICE_MODEL := Home Hub 5
@@ -193,6 +215,7 @@ endef
 TARGET_DEVICES += bt_homehub-v5a
 
 define Device/buffalo_wbmr-300hpd
+  $(Device/dsa-migration)
   DEVICE_VENDOR := Buffalo
   DEVICE_MODEL := WBMR-300HPD
   IMAGE_SIZE := 15616k
@@ -202,6 +225,7 @@ endef
 TARGET_DEVICES += buffalo_wbmr-300hpd
 
 define Device/lantiq_easy80920-nand
+  $(Device/dsa-migration)
   $(Device/lantiqFullImage)
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := VR9 EASY80920
@@ -212,6 +236,7 @@ endef
 TARGET_DEVICES += lantiq_easy80920-nand
 
 define Device/lantiq_easy80920-nor
+  $(Device/dsa-migration)
   DEVICE_VENDOR := Lantiq
   DEVICE_MODEL := VR9 EASY80920
   DEVICE_VARIANT := NOR
@@ -221,6 +246,7 @@ endef
 TARGET_DEVICES += lantiq_easy80920-nor
 
 define Device/netgear_dm200
+  $(Device/dsa-migration)
   DEVICE_VENDOR := NETGEAR
   DEVICE_MODEL := DM200
   IMAGES := sysupgrade.bin factory.img
@@ -236,6 +262,7 @@ endef
 TARGET_DEVICES += netgear_dm200
 
 define Device/zyxel_p-2812hnu-f1
+  $(Device/dsa-migration)
   $(Device/NAND)
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := P-2812HNU
@@ -248,6 +275,7 @@ endef
 TARGET_DEVICES += zyxel_p-2812hnu-f1
 
 define Device/zyxel_p-2812hnu-f3
+  $(Device/dsa-migration)
   $(Device/NAND)
   DEVICE_VENDOR := ZyXEL
   DEVICE_MODEL := P-2812HNU