[openwrt/openwrt] ipq40xx: luma_wrtq-329acn: convert to DSA

[LEDE Commits]

ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/70d9193b511f957054245195857cfbc5d5632c42

commit 70d9193b511f957054245195857cfbc5d5632c42
Author: Tomasz Maciej Nowak <tmn505 at gmail.com>
AuthorDate: Mon Oct 3 14:58:53 2022 +0200

    ipq40xx: luma_wrtq-329acn: convert to DSA
    
    Convert luma_wrtq-329acn device to DSA and enable it.
    
    Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
    Reviewed-by: Robert Marko <robimarko at gmail.com>
    [ improve commit description ]
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 .../ipq40xx/base-files/etc/board.d/02_network      |  1 +
 .../arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts | 55 +++++++++++++++-------
 target/linux/ipq40xx/image/generic.mk              |  3 +-
 3 files changed, 41 insertions(+), 18 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 3d05589369..d9a162b10d 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -30,6 +30,7 @@ ipq40xx_setup_interfaces()
 	cilab,meshpoint-one|\
 	edgecore,ecw5211|\
 	glinet,gl-b2200|\
+	luma,wrtq-329acn|\
 	mikrotik,cap-ac|\
 	netgear,wac510)
 		ucidef_set_interfaces_lan_wan "lan" "wan"
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
index 2407698fe1..4694c56819 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wrtq-329acn.dts
@@ -45,10 +45,6 @@
 			status = "okay";
 		};
 
-		mdio at 90000 {
-			status = "okay";
-		};
-
 		tcsr at 1949000 {
 			compatible = "qcom,tcsr";
 			reg = <0x1949000 0x100>;
@@ -213,6 +209,45 @@
 	status = "okay";
 };
 
+&gmac {
+	status = "okay";
+};
+
+&ethphy0 {
+	status = "disabled";
+};
+
+&ethphy1 {
+	status = "disabled";
+};
+
+&ethphy3 {
+	status = "disabled";
+};
+
+&mdio {
+	status = "okay";
+};
+
+&switch {
+	status = "okay";
+};
+
+&swport3 {
+	status = "okay";
+
+	label = "lan";
+	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_6>;
+};
+
+&swport5 {
+	status = "okay";
+
+	nvmem-cell-names = "mac-address";
+	nvmem-cells = <&macaddr_art_0>;
+};
+
 &tlmm {
 	serial0_pins: serial0_pinmux {
 		mux {
@@ -252,18 +287,6 @@
 	status = "okay";
 };
 
-&ethphy0 {
-	status = "disabled";
-};
-
-&ethphy1 {
-	status = "disabled";
-};
-
-&ethphy3 {
-	status = "disabled";
-};
-
 &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 47e8c129b4..69ec42c266 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -727,8 +727,7 @@ define Device/luma_wrtq-329acn
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 endef
-# Missing DSA Setup
-#TARGET_DEVICES += luma_wrtq-329acn
+TARGET_DEVICES += luma_wrtq-329acn
 
 define Device/meraki_mr33
 	$(call Device/FitImage)