[openwrt/openwrt] ath79: add support for Mercury MW4530R v1

Sat Sep 12 14:31:34 EDT 2020

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/53df30f02beab977991431c6f687f5ac5d88999c

commit 53df30f02beab977991431c6f687f5ac5d88999c
Author: Zhong Jianxin <azuwis at gmail.com>
AuthorDate: Sat Sep 5 19:03:09 2020 +0800

    ath79: add support for Mercury MW4530R v1
    
    Mercury MW4530R is a TP-Link TL-WDR4310 clone.
    
    Specification:
    
    * SOC: Atheros AR9344 (560 MHz)
    * RAM: 128 MiB
    * Flash: 8192 KiB
    * Ethernet: 5 x 10/100/1000 (4 x LAN, 1 x WAN) (AR8327)
    * Wireless:
      - 2.4 GHz b/g/n (internal)
      - 5 GHz a/n (AR9580)
    * USB: yes, 1 x USB 2.0
    
    Installation:
    
    Flash factory image via OEM web interface.
    
    Signed-off-by: Zhong Jianxin <azuwis at gmail.com>
---
 .../linux/ath79/dts/ar9344_mercury_mw4530r-v1.dts  |  9 +++++
 .../generic/base-files/etc/board.d/02_network      | 38 ++++++++++++----------
 .../etc/hotplug.d/firmware/10-ath9k-eeprom         |  1 +
 .../base-files/etc/uci-defaults/04_led_migration   | 15 +++++----
 target/linux/ath79/image/generic.mk                | 12 +++++++
 5 files changed, 50 insertions(+), 25 deletions(-)

diff --git a/target/linux/ath79/dts/ar9344_mercury_mw4530r-v1.dts b/target/linux/ath79/dts/ar9344_mercury_mw4530r-v1.dts
new file mode 100644
index 0000000000..5a6d3633bc
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_mercury_mw4530r-v1.dts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "ar9344_tplink_tl-wdr4300.dtsi"
+
+/ {
+	model = "Mercury MW4530R v1";
+	compatible = "mercury,mw4530r-v1", "qca,ar9344";
+};
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
index 2923ffabeb..0206e2360e 100755
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -223,6 +223,19 @@ ath79_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0 at eth0" "5:wan" "6 at eth1" "4:lan"
 		;;
+	mercury,mw4530r-v1|\
+	tplink,archer-a7-v5|\
+	tplink,archer-c6-v2|\
+	tplink,archer-c6-v2-us|\
+	tplink,archer-c7-v4|\
+	tplink,archer-c7-v5|\
+	tplink,tl-wdr3600-v1|\
+	tplink,tl-wdr4300-v1|\
+	tplink,tl-wdr4300-v1-il|\
+	tplink,tl-wdr4310-v1)
+		ucidef_add_switch "switch0" \
+			"0 at eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
+		;;
 	nec,wg1200cr|\
 	ubnt,nanostation-ac|\
 	yuncore,a782|\
@@ -273,18 +286,6 @@ ath79_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0 at eth0" "2:lan:3" "3:lan:2" "4:lan:1"
 		;;
-	tplink,archer-a7-v5|\
-	tplink,archer-c6-v2|\
-	tplink,archer-c6-v2-us|\
-	tplink,archer-c7-v4|\
-	tplink,archer-c7-v5|\
-	tplink,tl-wdr3600-v1|\
-	tplink,tl-wdr4300-v1|\
-	tplink,tl-wdr4300-v1-il|\
-	tplink,tl-wdr4310-v1)
-		ucidef_add_switch "switch0" \
-			"0 at eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan"
-		;;
 	tplink,archer-c5-v1|\
 	tplink,archer-c7-v1|\
 	tplink,archer-c7-v2|\
@@ -502,6 +503,13 @@ ath79_setup_macs()
 		wan_mac=$(fconfig -s -r -d $(find_mtd_part "RedBoot config") -n alias/ethaddr)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
+	mercury,mw4530r-v1|\
+	tplink,tl-wdr3600-v1|\
+	tplink,tl-wdr4300-v1|\
+	tplink,tl-wdr4300-v1-il)
+		base_mac=$(mtd_get_mac_binary u-boot 0x1fc00)
+		wan_mac=$(macaddr_add "$base_mac" 1)
+		;;
 	nec,wg800hp)
 		lan_mac=$(mtd_get_mac_text board_data 0x280)
 		wan_mac=$(mtd_get_mac_text board_data 0x480)
@@ -536,12 +544,6 @@ ath79_setup_macs()
 		base_mac=$(mtd_get_mac_binary info 0x8)
 		wan_mac=$(macaddr_add "$base_mac" 1)
 		;;
-	tplink,tl-wdr3600-v1|\
-	tplink,tl-wdr4300-v1|\
-	tplink,tl-wdr4300-v1-il)
-		base_mac=$(mtd_get_mac_binary u-boot 0x1fc00)
-		wan_mac=$(macaddr_add "$base_mac" 1)
-		;;
 	trendnet,tew-823dru)
 		lan_mac=$(mtd_get_mac_text mac 0x4)
 		wan_mac=$(mtd_get_mac_text mac 0x18)
diff --git a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 3871825682..5ecae96cd1 100644
--- a/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -90,6 +90,7 @@ case "$FIRMWARE" in
 		caldata_extract "calibrate" 0x5000 0x440
 		ath9k_patch_mac $(mtd_get_mac_ascii u-boot-env0 RADIOADDR0)
 		;;
+	mercury,mw4530r-v1|\
 	ocedo,raccoon|\
 	tplink,tl-wdr3500-v1|\
 	tplink,tl-wdr3600-v1|\
diff --git a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
index 2dcdf7b007..02bdbb8476 100644
--- a/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
+++ b/target/linux/ath79/generic/base-files/etc/uci-defaults/04_led_migration
@@ -21,6 +21,14 @@ engenius,epg5000)
 glinet,gl-mifi)
 	migrate_leds ":net=:3g4g"
 	;;
+mercury,mw4530r-v1|\
+tplink,archer-c7-v2|\
+tplink,tl-wdr3600-v1|\
+tplink,tl-wdr4300-v1|\
+tplink,tl-wdr4300-v1-il|\
+tplink,tl-wdr4310-v1)
+	migrate_leds ":blue:=:green:"
+	;;
 tplink,archer-c25-v1|\
 tplink,archer-c58-v1|\
 tplink,archer-c59-v1|\
@@ -32,13 +40,6 @@ tplink,archer-c7-v5|\
 tplink,tl-wr902ac-v1)
 	migrate_leds "^$boardonly:=tp-link:"
 	;;
-tplink,archer-c7-v2|\
-tplink,tl-wdr3600-v1|\
-tplink,tl-wdr4300-v1|\
-tplink,tl-wdr4300-v1-il|\
-tplink,tl-wdr4310-v1)
-	migrate_leds ":blue:=:green:"
-	;;
 tplink,re355-v1)
 	migrate_leds "re355:=tp-link:"
 	;;
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 5dd1dacae4..7a00bae287 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1090,6 +1090,18 @@ define Device/meraki_mr16
 endef
 TARGET_DEVICES += meraki_mr16
 
+define Device/mercury_mw4530r-v1
+  $(Device/tplink-8mlzma)
+  SOC := ar9344
+  DEVICE_VENDOR := Mercury
+  DEVICE_MODEL := MW4530R
+  DEVICE_VARIANT := v1
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-ledtrig-usbport
+  TPLINK_HWID := 0x45300001
+  SUPPORTED_DEVICES += tl-wdr4300
+endef
+TARGET_DEVICES += mercury_mw4530r-v1
+
 define Device/nec_wg1200cr
   SOC := qca9563
   DEVICE_VENDOR := NEC

