[openwrt/openwrt] ipq40xx: convert GL.iNet GL-S1300 to DSA

[LEDE Commits]

nick pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/70586f574d93bf5b48f878a3c2a264b0249830c1

commit 70586f574d93bf5b48f878a3c2a264b0249830c1
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Sun Dec 29 22:55:04 2024 +0100

    ipq40xx: convert GL.iNet GL-S1300 to DSA
    
    Convert the router to DSA.
    
    Co-Developed-by: Matt Beaumont <github at beaum.xyz>
    Tested-by: Matt Beaumont <github at beaum.xyz>
    Link: https://github.com/openwrt/openwrt/pull/12478
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 .../ipq40xx/base-files/etc/board.d/02_network      |  1 +
 .../arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts    | 39 ++++++++++++++++++++++
 target/linux/ipq40xx/image/generic.mk              |  3 +-
 3 files changed, 41 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 549e1ac0c9..57dca0e1a2 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -84,6 +84,7 @@ ipq40xx_setup_interfaces()
 		;;
 	glinet,gl-a1300|\
 	glinet,gl-b1300|\
+	glinet,gl-s1300|\
 	mobipromo,cm520-79f)
 		ucidef_set_interfaces_lan_wan "lan1 lan2" "wan"
 		;;
diff --git a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts
index e6d74da864..6d7a0aa2cd 100644
--- a/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts
+++ b/target/linux/ipq40xx/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq4029-gl-s1300.dts
@@ -197,6 +197,14 @@
 					precal_art_5000: precal at 5000 {
 						reg = <0x5000 0x2f20>;
 					};
+
+					macaddr_art_0: macaddr at 0 {
+						reg = <0x0 0x6>;
+					};
+
+					macaddr_art_6: macaddr at 6 {
+						reg = <0x6 0x6>;
+					};
 				};
 			};
 
@@ -348,6 +356,37 @@
 	status = "okay";
 };
 
+&gmac {
+	status = "okay";
+
+	nvmem-cells = <&macaddr_art_0>;
+	nvmem-cell-names = "mac-address";
+};
+
+&switch {
+	status = "okay";
+};
+
+&swport3 {
+	status = "okay";
+
+	label = "lan2";
+};
+
+&swport4 {
+	status = "okay";
+
+	label = "lan1";
+};
+
+&swport5 {
+	status = "okay";
+
+	label = "wan";
+	nvmem-cells = <&macaddr_art_6>;
+	nvmem-cell-names = "mac-address";
+};
+
 &wifi0 {
 	status = "okay";
 	nvmem-cell-names = "pre-calibration";
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 21841f4bf1..2071059444 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -642,8 +642,7 @@ define Device/glinet_gl-s1300
 	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
 	DEVICE_PACKAGES := kmod-fs-ext4 kmod-mmc kmod-spi-dev
 endef
-# Missing DSA Setup
-#TARGET_DEVICES += glinet_gl-s1300
+TARGET_DEVICES += glinet_gl-s1300
 
 define Device/kernel-size-6350-8300
 	DEVICE_COMPAT_VERSION := 2.0