From: Kristian Skramstad <kristian+github@83.no>
Date: Fri, 29 Sep 2023 02:13:35 +0000 (+0200)
Subject: qualcommax: ipq807x: alphabetically sort Netgear WAX family.
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f9f2c8ef05c1a085b4c07961abfb0fcd3d8cc4e2;p=openwrt%2Fstaging%2Fblocktrron.git

qualcommax: ipq807x: alphabetically sort Netgear WAX family.

As requested by the maintainers, the order for the WAX family
should be alphabetically. WAX620 is now after WAX218.

Files changed:
+ipq807x.mk
+01_leds

No changes to the content.

Signed-off-by: Kristian Skramstad <kristian+github@83.no>
---

diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk
index b61b721f3a..c0f15f3c83 100644
--- a/target/linux/qualcommax/image/ipq807x.mk
+++ b/target/linux/qualcommax/image/ipq807x.mk
@@ -115,36 +115,36 @@ define Device/netgear_rax120v2
 endef
 TARGET_DEVICES += netgear_rax120v2
 
-define Device/netgear_wax620
+define Device/netgear_wax218
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
+	ARTIFACTS := web-ui-factory.fit
 	DEVICE_VENDOR := Netgear
-	DEVICE_MODEL := WAX620
+	DEVICE_MODEL := WAX218
 	DEVICE_DTS_CONFIG := config@hk07
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	SOC := ipq8072
-	DEVICE_PACKAGES += kmod-spi-gpio kmod-gpio-nxp-74hc164 \
-		ipq-wifi-netgear_wax620
+	ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \
+		ubinize-kernel | qsdk-ipq-factory-nand
+	DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \
+		ipq-wifi-netgear_wax218
 endef
-TARGET_DEVICES += netgear_wax620
+TARGET_DEVICES += netgear_wax218
 
-define Device/netgear_wax218
+define Device/netgear_wax620
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
-	ARTIFACTS := web-ui-factory.fit
 	DEVICE_VENDOR := Netgear
-	DEVICE_MODEL := WAX218
+	DEVICE_MODEL := WAX620
 	DEVICE_DTS_CONFIG := config@hk07
 	BLOCKSIZE := 128k
 	PAGESIZE := 2048
 	SOC := ipq8072
-	ARTIFACT/web-ui-factory.fit := append-image initramfs-uImage.itb | \
-		ubinize-kernel | qsdk-ipq-factory-nand
-	DEVICE_PACKAGES := kmod-spi-gpio kmod-spi-bitbang kmod-gpio-nxp-74hc164 \
-		ipq-wifi-netgear_wax218
+	DEVICE_PACKAGES += kmod-spi-gpio kmod-gpio-nxp-74hc164 \
+		ipq-wifi-netgear_wax620
 endef
-TARGET_DEVICES += netgear_wax218
+TARGET_DEVICES += netgear_wax620
 
 define Device/prpl_haze
 	$(call Device/FitImage)
diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/board.d/01_leds b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/01_leds
index 913b58750c..3c13fb06a7 100644
--- a/target/linux/qualcommax/ipq807x/base-files/etc/board.d/01_leds
+++ b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/01_leds
@@ -12,14 +12,14 @@ edgecore,eap102)
 netgear,rax120v2)
 	ucidef_set_led_netdev "aqr" "AQR" "white:aqr" "lan5"
 	;;
-netgear,wax620)
-	ucidef_set_led_netdev "lan" "LAN" "lan:green" "lan"
-	;;
 netgear,wax218)
 	ucidef_set_led_netdev "lan" "LAN" "blue:lan" "lan"
 	ucidef_set_led_wlan "wlan5g" "WIFI 5GHz" "blue:wlan5g" "phy0radio"
 	ucidef_set_led_wlan "wlan2g" "WIFI 2.4GHz" "blue:wlan2g" "phy1radio"
 	;;
+netgear,wax620)
+	ucidef_set_led_netdev "lan" "LAN" "lan:green" "lan"
+	;;
 redmi,ax6|\
 xiaomi,ax3600)
 	ucidef_set_led_netdev "wan" "WAN" "blue:network" "wan"