[openwrt/openwrt] ramips: make Netgear R7200 a separate device from R6700v2

[LEDE Commits]

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

commit af3104d25b0b254d54b3bb3cc570c958c24c4015
Author: Dale Hui <strokes-races0b at icloud.com>
AuthorDate: Fri Aug 20 22:36:50 2021 -0700

    ramips: make Netgear R7200 a separate device from R6700v2
    
    With the various variants of Netgear R**** devices, make it more
    obvious which image should be used for the R7200.
    
    Signed-off-by: Dale Hui <strokes-races0b at icloud.com>
    [provide proper commit message]
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 target/linux/ramips/dts/mt7621_netgear_r7200.dts          | 15 +++++++++++++++
 target/linux/ramips/image/mt7621.mk                       | 15 ++++++++++++---
 target/linux/ramips/mt7621/base-files/etc/board.d/01_leds |  3 ++-
 .../ramips/mt7621/base-files/lib/upgrade/platform.sh      |  1 +
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/target/linux/ramips/dts/mt7621_netgear_r7200.dts b/target/linux/ramips/dts/mt7621_netgear_r7200.dts
new file mode 100644
index 0000000000..0ff80830f7
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_netgear_r7200.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "mt7621_netgear_sercomm_bzv.dtsi"
+
+/ {
+	compatible = "netgear,r7200", "mediatek,mt7621-soc";
+	model = "Netgear R7200";
+};
+
+&leds {
+	guest_wifi {
+		gpios = <&gpio_expander 6 GPIO_ACTIVE_LOW>;
+		label = "white:guest_wifi";
+	};
+};
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 68993a02fb..cab926dccd 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -1065,9 +1065,6 @@ define Device/netgear_r6700-v2
   DEVICE_ALT0_VENDOR := NETGEAR
   DEVICE_ALT0_MODEL := Nighthawk AC2400
   DEVICE_ALT0_VARIANT := v1
-  DEVICE_ALT1_VENDOR := NETGEAR
-  DEVICE_ALT1_MODEL := R7200
-  DEVICE_ALT1_VARIANT := v1
   SERCOMM_HWNAME := R6950
   SERCOMM_HWID := BZV
   SERCOMM_HWVER := A001
@@ -1101,6 +1098,18 @@ define Device/netgear_r6850
 endef
 TARGET_DEVICES += netgear_r6850
 
+define Device/netgear_r7200
+  $(Device/netgear_sercomm_nand)
+  DEVICE_MODEL := R7200
+  SERCOMM_HWNAME := R6950
+  SERCOMM_HWID := BZV
+  SERCOMM_HWVER := A001
+  SERCOMM_SWVER := 0x1032
+  IMAGE_SIZE := 40960k
+  DEVICE_PACKAGES += kmod-mt7615e kmod-mt7615-firmware
+endef
+TARGET_DEVICES += netgear_r7200
+
 define Device/netgear_wac104
   $(Device/netgear_sercomm_nand)
   DEVICE_MODEL := WAC104
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
index d01ba53568..314cb5bb10 100644
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -89,7 +89,8 @@ netgear,wndr3700-v5)
 	ucidef_set_led_netdev "wan" "wan" "green:wan" "wan"
 	;;
 netgear,r6700-v2|\
-netgear,r6800)
+netgear,r6800|\
+netgear,r7200)
 	ucidef_set_led_netdev "wan" "WAN" "white:wan" "wan"
 	ucidef_set_led_netdev "lan1" "LAN1" "white:lan1" "lan1"
 	ucidef_set_led_netdev "lan2" "LAN2" "white:lan2" "lan2"
diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
index a925dd0f18..94d66382fa 100755
--- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh
@@ -71,6 +71,7 @@ platform_do_upgrade() {
 	netgear,r6700-v2|\
 	netgear,r6800|\
 	netgear,r6850|\
+	netgear,r7200|\
 	netgear,wac104|\
 	netgear,wac124|\
 	netis,wf2881|\