mediatek: filogic: add support for netis MEX605

This commit adds support for the netis MEX605, which is a variant based on the netis NX30 V2.
1. Update brand naming from Netis to netis to follow the official branding.
2. Rename NX30V2 to NX30 V2 to correctly reflect it as the second version of the NX30.
3. Update variant notation for consistency.

cherry picked from commit c982357
1. Add 'model' to the DTS for netis NX30 V2 and define WiFi LED.
4. Fix typo.

Signed-off-by: Zhiwei Cao <bfdeh@126.com>
Signed-off-by: David Han <h96643864@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22726
(cherry picked from commit 8d844758c20c2f3e60d8075dc97121dfc7cc444d)
Link: https://github.com/openwrt/openwrt/pull/23409
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

4 files changed, 29 insertions, 11 deletions

diff --git a/package/boot/uboot-mediatek/Makefile b/package/boot/uboot-mediatek/Makefile
index 3b5b6c9c9c..ffd95daaa4 100644
--- a/package/boot/uboot-mediatek/Makefile
+++ b/package/boot/uboot-mediatek/Makefile
@@ -482,7 +482,7 @@ define U-Boot/mt7981_netis_eap930-v1
 endef
 
 define U-Boot/mt7981_netis_nx30v2
-  NAME:=Netis NX30V2
+  NAME:=netis NX30 V2
   BUILD_SUBTARGET:=filogic
   BUILD_DEVICES:=netis_nx30v2
   UBOOT_CONFIG:=mt7981_netis_nx30v2
diff --git a/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch b/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch
index ed16e7a6fa..3f1d04bed8 100644
--- a/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch
+++ b/package/boot/uboot-mediatek/patches/461-add-netis-nx30v2.patch
@@ -1,6 +1,6 @@
 --- /dev/null
 +++ b/arch/arm/dts/mt7981-netis-nx30v2.dts
-@@ -0,0 +1,160@@
+@@ -0,0 +1,160 @@
 +// SPDX-License-Identifier: GPL-2.0
 +
 +/dts-v1/;
@@ -9,7 +9,7 @@
 +#include <dt-bindings/input/input.h>
 +
 +/ {
-+	model = "Netis NX30V2";
++	model = "netis NX30 V2";
 +	compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
 +	chosen {
 +		stdout-path = &uart0;
@@ -163,7 +163,7 @@
 +};
 --- /dev/null
 +++ b/configs/mt7981_netis_nx30v2_defconfig
-@@ -0,0 +1,156 @@
+@@ -0,0 +1,157 @@
 +CONFIG_ARM=y
 +CONFIG_SYS_HAS_NONCACHED_MEMORY=y
 +CONFIG_POSITION_INDEPENDENT=y
@@ -381,10 +381,10 @@
 +
 +#netconsole
 +netconsole=setenv stdout serial,nc;setenv stdin serial,nc
-+nonetconcole=setenv stdout serial;setenv stdin serial
++nonetconsole=setenv stdout serial;setenv stdin serial
 +
 +# button commands
-+button_cmd_0=run netconsole led_on; sleep 5; if button wps; then run nonetconcole offical_upgrade; fi
++button_cmd_0=run netconsole led_on; sleep 5; if button wps; then run nonetconsole offical_upgrade; fi
 +button_cmd_0_name=wps
-+button_cmd_1=run netconsole led_on reset_all; sleep 5; if button reset; then run nonetconcole; while true; do run upgrade_fw && run boot_nand; done; fi
++button_cmd_1=run netconsole led_on reset_all; sleep 5; if button reset; then run nonetconsole; while true; do run upgrade_fw && run boot_nand; done; fi
 +button_cmd_1_name=reset
diff --git a/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts b/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts
index cbd6666d49..1e3a6b5577 100644
--- a/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts
+++ b/target/linux/mediatek/dts/mt7981b-netis-nx30v2.dts
@@ -4,6 +4,7 @@
 #include "mt7981b-netis-common.dtsi"
 
 / {
+	model = "netis NX30 V2";
 	compatible = "netis,nx30v2", "mediatek,mt7981";
 
 	aliases {
@@ -36,6 +37,20 @@
 			gpios = <&pio 5 GPIO_ACTIVE_LOW>;
 		};
 
+		wifi2g {
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_WLAN_2GHZ;
+			gpios = <&pio 34 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+
+		wifi5g {
+			color = <LED_COLOR_ID_BLUE>;
+			function = LED_FUNCTION_WLAN_5GHZ;
+			gpios = <&pio 35 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+
 		wan {
 			color = <LED_COLOR_ID_BLUE>;
 			function = LED_FUNCTION_WAN;
diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk
index c54071ee50..0571316257 100644
--- a/target/linux/mediatek/image/filogic.mk
+++ b/target/linux/mediatek/image/filogic.mk
@@ -2528,16 +2528,19 @@ endef
 TARGET_DEVICES += netis_eap930-v1
 
 define Device/netis_nx30v2
-  DEVICE_VENDOR := Netis
-  DEVICE_MODEL := NX30V2
+  DEVICE_VENDOR := netis
+  DEVICE_MODEL := NX30
+  DEVICE_VARIANT := V2
   DEVICE_ALT0_VENDOR := Netcore
-  DEVICE_ALT0_MODEL := POWER30AX
+  DEVICE_ALT0_MODEL := POWER 30AX
   DEVICE_ALT1_VENDOR := Netcore
-  DEVICE_ALT1_MODEL := N30PRO
+  DEVICE_ALT1_MODEL := N30 Pro
   DEVICE_ALT2_VENDOR := GWBN
   DEVICE_ALT2_MODEL := GW3001
   DEVICE_ALT3_VENDOR := GLC
   DEVICE_ALT3_MODEL := W7
+  DEVICE_ALT4_VENDOR := netis
+  DEVICE_ALT4_MODEL := MEX605
   DEVICE_DTS := mt7981b-netis-nx30v2
   DEVICE_DTS_DIR := ../dts
   DEVICE_DTC_FLAGS := --pad 4096