From: David Bauer <mail@david-bauer.net>
Date: Thu, 11 May 2023 23:58:39 +0000 (+0200)
Subject: ipq40xx: convert ZyXEL WRE6606 to DSA
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69c28d50aa825bdd92a716f838fd2a1a68a1747b;p=openwrt%2Fstaging%2Fblocktrron.git

ipq40xx: convert ZyXEL WRE6606 to DSA

Signed-off-by: David Bauer <mail@david-bauer.net>
---

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 b131d0d618..744425c914 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -55,7 +55,8 @@ ipq40xx_setup_interfaces()
 	mikrotik,lhgg-60ad|\
 	mikrotik,sxtsq-5-ac|\
 	netgear,ex6100v2|\
-	netgear,ex6150v2)
+	netgear,ex6150v2|\
+	zyxel,wre6606)
 		ucidef_set_interface_lan "lan"
 		;;
 	avm,fritzbox-7530)
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
index efb267ae36..b7d46a2ba2 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wre6606.dts
@@ -250,3 +250,16 @@
 	status = "okay";
 	qcom,ath10k-calibration-variant = "ZyXEL-WRE6606";
 };
+
+&gmac {
+	status = "okay";
+};
+
+&switch {
+	status = "okay";
+};
+
+&swport4 {
+	status = "okay";
+	label = "lan";
+};
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 59d4f082ff..50499a7833 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -1185,5 +1185,5 @@ define Device/zyxel_wre6606
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
 	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
 endef
-# Missing DSA Setup
-#TARGET_DEVICES += zyxel_wre6606
+Missing DSA Setup
+TARGET_DEVICES += zyxel_wre6606