From 7c04e80f87f343bde6d137d813d694f40f3ec481 Mon Sep 17 00:00:00 2001
From: James Andrewartha <trs80@ucc.asn.au>
Date: Tue, 17 Jan 2023 15:02:02 +0800
Subject: [PATCH] ipq40xx: convert Extreme AP3915i to DSA

Convert and re-enabled Extreme AP3915i to DSA.

Signed-off-by: James Andrewartha <trs80@ucc.asn.au>
---
 .../ipq40xx/base-files/etc/board.d/02_network      |  1 +
 .../arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts  | 14 ++++++++++++++
 target/linux/ipq40xx/image/generic.mk              |  3 +--
 3 files changed, 16 insertions(+), 2 deletions(-)

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 7d4806b605..e5789d15b9 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -46,6 +46,7 @@ ipq40xx_setup_interfaces()
 	aruba,ap-303|\
 	avm,fritzrepeater-1200|\
 	dlink,dap-2610|\
+	extreme-networks,ws-ap3915i|\
 	meraki,mr33|\
 	meraki,mr74|\
 	mikrotik,lhgg-60ad|\
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts
index 423c24b89a..08874bcf4f 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ws-ap3915i.dts
@@ -124,6 +124,20 @@
 	status = "okay";
 };
 
+&gmac {
+       status = "okay";
+};
+
+&switch {
+       status = "okay";
+};
+
+&swport5 {
+       status = "okay";
+
+       label = "lan";
+};
+
 &tlmm {
 	mdio_pins: mdio_pinmux {
 		mux_1 {
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index deec544f65..a145f05358 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -542,8 +542,7 @@ define Device/extreme-networks_ws-ap3915i
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
 	DEVICE_PACKAGES := ipq-wifi-extreme-networks_ws-ap3915i
 endef
-# Missing DSA Setup
-#TARGET_DEVICES += extreme-networks_ws-ap3915i
+TARGET_DEVICES += extreme-networks_ws-ap3915i
 
 define Device/ezviz_cs-w3-wd1200g-eup
 	$(call Device/FitImage)
-- 
2.30.2