[openwrt/openwrt] ipq40xx: pakedge_wr-1: convert to DSA

[LEDE Commits]

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

commit ee38573093563a11569afd98495f7a7a85e9a02f
Author: Tomasz Maciej Nowak <tmn505 at gmail.com>
AuthorDate: Mon Oct 3 14:59:15 2022 +0200

    ipq40xx: pakedge_wr-1: convert to DSA
    
    Convert pakedge_wr-1 device to DSA and enable it.
    
    Signed-off-by: Tomasz Maciej Nowak <tmn505 at gmail.com>
    Reviewed-by: Robert Marko <robimarko at gmail.com>i
    [ improve commit description ]
    Signed-off-by: Christian Marangi <ansuelsmth at gmail.com>
---
 .../ipq40xx/base-files/etc/board.d/02_network      |  1 +
 .../files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts  | 37 ++++++++++++++++++++++
 target/linux/ipq40xx/image/generic.mk              |  3 +-
 3 files changed, 39 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 d9a162b10d..163dcdcbc6 100644
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -21,6 +21,7 @@ ipq40xx_setup_interfaces()
 	mikrotik,hap-ac3|\
 	p2w,r619ac-64m|\
 	p2w,r619ac-128m|\
+	pakedge,wr-1|\
 	zyxel,nbg6617)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		;;
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
index 317fe26e2e..16951da47f 100644
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-wr-1.dts
@@ -11,6 +11,7 @@
 	compatible = "pakedge,wr-1";
 
 	aliases {
+		label-mac-device = &gmac;
 		led-boot = &led_power;
 		led-failsafe = &led_power;
 		led-running = &led_power;
@@ -177,6 +178,10 @@
 	status = "okay";
 };
 
+&gmac {
+	status = "okay";
+};
+
 &mdio {
 	status = "okay";
 };
@@ -185,6 +190,38 @@
 	status = "okay";
 };
 
+&switch {
+	status = "okay";
+};
+
+&swport1 {
+	status = "okay";
+
+	label = "lan4";
+};
+
+&swport2 {
+	status = "okay";
+
+	label = "lan3";
+};
+
+&swport3 {
+	status = "okay";
+
+	label = "lan2";
+};
+
+&swport4 {
+	status = "okay";
+
+	label = "lan1";
+};
+
+&swport5 {
+	status = "okay";
+};
+
 &tlmm {
 	key_pins: key_pinmux {
 		mux {
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 69ec42c266..3c1cf67448 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -938,8 +938,7 @@ define Device/pakedge_wr-1
 	IMAGE_SIZE := 31232k
 	IMAGE/sysupgrade.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | append-metadata
 endef
-# Missing DSA Setup
-#TARGET_DEVICES += pakedge_wr-1
+TARGET_DEVICES += pakedge_wr-1
 
 define Device/plasmacloud_pa1200
 	$(call Device/FitImageLzma)