mvebu: rename Linksys devices based on their common names

The Linksys devices in mvebu target feature a mixed naming,
where parts are based on the official product name (device
node, image; e.g. WRT3200ACM) and parts are based on the
internal code name (DTS file name, compatible, LED labels;
e.g. rango). This inconsistent naming has been perceived
as quite confusing.

A recent attempt by Paul Spooren to harmonize this naming
in kernel has been declined there. However, for us it still
makes sense to apply at least a part of these changes
locally.

Primarily, this patch changes the compatible in DTS and thus
the board name used in various scripts to have them in line
with the device, model and image names. Due to the recent
switch from swconfig to DSA, this allows us to drop
SUPPORTED_DEVICES and thus prevent seamless upgrade between
these incompatible setups.

However, this does not include the LED label rename from
Paul's initial patch: I don't think it's worth keeping the
enormous diff locally for this case, as we can implement
this much easier in 01_leds if we have to live with the
inconsistency anyway.

Signed-off-by: Paul Spooren <mail@aparcar.org>
[rebase, extend to all devices, drop DT LED changes]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>

package/boot/uboot-envtools/files/mvebu

@@ -27,16 +27,16 @@ globalscale,espressobin-v7-emmc|\
 marvell,armada8040-mcbin)
 	ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1"
 	;;
-linksys,caiman|\
+linksys,wrt1200ac|\
-linksys,cobra|\
+linksys,wrt1900ac-v2|\
-linksys,shelby)
+linksys,wrt1900acs)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x40000"
 	;;
-linksys,mamba)
+linksys,wrt1900ac-v1)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000"
 	;;
-linksys,rango|\
+linksys,wrt3200acm|\
-linksys,venom)
+linksys,wrt32x)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
 	;;
 methode,udpu)

target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds

@@ -12,22 +12,37 @@ board=$(board_name)
 boardname="${board##*,}"
 
 case "$board" in
-linksys,caiman|\
+linksys,wrt1200ac)
-linksys,cobra|\
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:caiman:white:wan" "wan"
-linksys,rango|\
+	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:caiman:white:usb2" "usb1-port1"
-linksys,shelby)
+	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:caiman:white:usb3_1" "usb2-port1" "usb3-port1"
-	ucidef_set_led_netdev "wan" "WAN" "pca963x:$boardname:white:wan" "wan"
+	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:caiman:white:usb3_2" "usb3-port1"
-	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:$boardname:white:usb2" "usb1-port1"
-	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:$boardname:white:usb3_1" "usb2-port1" "usb3-port1"
-	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:$boardname:white:usb3_2" "usb3-port1"
 	;;
-linksys,mamba)
+linksys,wrt1900ac-v1)
 	ucidef_set_led_netdev "wan" "WAN" "mamba:white:wan" "wan"
 	ucidef_set_led_usbport "usb1" "USB 1" "mamba:white:usb2" "usb1-port1"
 	ucidef_set_led_usbport "usb2" "USB 2" "mamba:white:usb3_1" "usb2-port1" "usb3-port1"
 	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "mamba:white:usb3_2" "usb3-port2"
 	;;
-linksys,venom)
+linksys,wrt1900ac-v2)
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:cobra:white:wan" "wan"
+	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:cobra:white:usb2" "usb1-port1"
+	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:cobra:white:usb3_1" "usb2-port1" "usb3-port1"
+	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:cobra:white:usb3_2" "usb3-port1"
+	;;
+linksys,wrt1900acs)
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:shelby:white:wan" "wan"
+	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:shelby:white:usb2" "usb1-port1"
+	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:shelby:white:usb3_1" "usb2-port1" "usb3-port1"
+	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:shelby:white:usb3_2" "usb3-port1"
+	;;
+linksys,wrt3200acm)
+	ucidef_set_led_netdev "wan" "WAN" "pca963x:rango:white:wan" "wan"
+	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:rango:white:usb2" "usb1-port1"
+	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:rango:white:usb3_1" "usb2-port1" "usb3-port1"
+	ucidef_set_led_usbport "usb2_ss" "USB 2 SS" "pca963x:rango:white:usb3_2" "usb3-port1"
+	;;
+linksys,wrt32x)
 	ucidef_set_led_netdev "wan" "WAN" "pca963x:venom:blue:wan" "wan"
 	ucidef_set_led_usbport "usb1" "USB 1" "pca963x:venom:blue:usb2" "usb1-port1"
 	ucidef_set_led_usbport "usb2" "USB 2" "pca963x:venom:blue:usb3_1" "usb2-port1" "usb3-port1"

target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network

@@ -16,12 +16,12 @@ mvebu_setup_interfaces()
 	cznic,turris-omnia)
 		ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3 lan4" "eth2"
 		;;
-	linksys,caiman|\
+	linksys,wrt1200ac|\
-	linksys,cobra|\
+	linksys,wrt1900ac-v1|\
-	linksys,mamba|\
+	linksys,wrt1900ac-v2|\
-	linksys,rango|\
+	linksys,wrt1900acs|\
-	linksys,shelby|\
+	linksys,wrt3200acm|\
-	linksys,venom)
+	linksys,wrt32x)
 		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
 		;;
 	marvell,a385-db-ap)
@@ -60,15 +60,15 @@ mvebu_setup_macs()
 	buffalo,ls421de)
 		lan_mac=$(mtd_get_mac_ascii u-boot-env eth1addr)
 		;;
-	linksys,caiman|\
+	linksys,wrt1200ac|\
-	linksys,cobra|\
+	linksys,wrt1900ac-v2|\
-	linksys,rango|\
+	linksys,wrt1900acs|\
-	linksys,shelby|\
+	linksys,wrt3200acm|\
-	linksys,venom)
+	linksys,wrt32x)
 		label_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		wan_mac=$(macaddr_setbit_la $label_mac)
 		;;
-	linksys,mamba)
+	linksys,wrt1900ac-v1)
 		label_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		lan_mac=$label_mac
 		wan_mac=$label_mac

target/linux/mvebu/cortexa9/base-files/etc/init.d/bootcount

@@ -4,12 +4,12 @@ START=99
 
 boot() {
 	case $(board_name) in
-	linksys,caiman |\
+	linksys,wrt1200ac|\
-	linksys,cobra |\
+	linksys,wrt1900ac-v1|\
-	linksys,mamba |\
+	linksys,wrt1900ac-v2|\
-	linksys,rango |\
+	linksys,wrt1900acs|\
-	linksys,shelby |\
+	linksys,wrt3200acm|\
-	linksys,venom)
+	linksys,wrt32x)
 		mtd resetbc s_env || true
 		;;
 	esac

target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/03_wireless

@@ -11,7 +11,11 @@
 board=$(board_name)
 
 case "$board" in
-linksys,caiman|linksys,cobra|linksys,mamba|linksys,shelby|linksys,venom)
+linksys,wrt1200ac|\
+linksys,wrt1900ac-v1|\
+linksys,wrt1900ac-v2|\
+linksys,wrt1900acs|\
+linksys,wrt32x)
 	SKU=$(strings /dev/mtd3|sed -ne 's/^cert_region=//p')
 	WIFIMAC2G=$(macaddr_add $(cat /sys/class/net/eth0/address) +1)
 	WIFIMAC5G=$(macaddr_add $WIFIMAC2G +1)
@@ -34,7 +38,7 @@ linksys,caiman|linksys,cobra|linksys,mamba|linksys,shelby|linksys,venom)
 	esac
 
 	case "$board" in
-		linksys,mamba)
+		linksys,wrt1900ac-v1)
 			WIFIMAC0=$WIFIMAC2G
 			WIFIMAC1=$WIFIMAC5G
 		;;

target/linux/mvebu/cortexa9/base-files/etc/uci-defaults/04_mambafan

@@ -8,7 +8,7 @@
 board=$(board_name)
 
 case "$board" in
-linksys,mamba)
+linksys,wrt1900ac-v1)
 	# Set fan script execution in crontab
 	grep -s -q fan_ctrl.sh /etc/crontabs/root && exit 0
 

target/linux/mvebu/cortexa9/base-files/lib/preinit/81_linksys_syscfg

@@ -8,7 +8,12 @@ preinit_mount_syscfg() {
 	. /lib/upgrade/common.sh
 
 	case $(board_name) in
-	linksys,caiman|linksys,cobra|linksys,mamba|linksys,rango|linksys,shelby|linksys,venom)
+	linksys,wrt1200ac|\
+	linksys,wrt1900ac-v1|\
+	linksys,wrt1900ac-v2|\
+	linksys,wrt1900acs|\
+	linksys,wrt3200acm|\
+	linksys,wrt32x)
 		needs_recovery=0
 		syscfg_part=$(grep syscfg /proc/mtd |cut -c4)
 		ubiattach -m $syscfg_part || needs_recovery=1

target/linux/mvebu/cortexa9/base-files/lib/upgrade/platform.sh

@@ -30,12 +30,12 @@ platform_do_upgrade() {
 	solidrun,clearfog-pro-a1)
 		platform_do_upgrade_sdcard "$1"
 		;;
-	linksys,caiman|\
+	linksys,wrt1200ac|\
-	linksys,cobra|\
+	linksys,wrt1900ac-v1|\
-	linksys,mamba|\
+	linksys,wrt1900ac-v2|\
-	linksys,rango|\
+	linksys,wrt1900acs|\
-	linksys,shelby|\
+	linksys,wrt3200acm|\
-	linksys,venom)
+	linksys,wrt32x)
 		platform_do_upgrade_linksys "$1"
 		;;
 	*)
@@ -50,12 +50,12 @@ platform_copy_config() {
 	solidrun,clearfog-pro-a1)
 		platform_copy_config_sdcard
 		;;
-	linksys,caiman|\
+	linksys,wrt1200ac|\
-	linksys,cobra|\
+	linksys,wrt1900ac-v1|\
-	linksys,mamba|\
+	linksys,wrt1900ac-v2|\
-	linksys,rango|\
+	linksys,wrt1900acs|\
-	linksys,shelby|\
+	linksys,wrt3200acm|\
-	linksys,venom)
+	linksys,wrt32x)
 		platform_copy_config_linksys
 		;;
 	esac

target/linux/mvebu/files-4.19/arch/arm/boot/dts/armada-385-linksys-venom.dts

@@ -44,8 +44,8 @@
 
 / {
 	model = "Linksys WRT32X";
-	compatible = "linksys,venom", "linksys,armada385", "marvell,armada385",
+	compatible = "linksys,wrt32x", "linksys,venom", "linksys,armada385",
-		     "marvell,armada380";
+		     "marvell,armada385", "marvell,armada380";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";

target/linux/mvebu/files-5.4/arch/arm/boot/dts/armada-385-linksys-venom.dts

@@ -44,8 +44,8 @@
 
 / {
 	model = "Linksys WRT32X";
-	compatible = "linksys,venom", "linksys,armada385", "marvell,armada385",
+	compatible = "linksys,wrt32x", "linksys,venom", "linksys,armada385",
-		     "marvell,armada380";
+		     "marvell,armada385", "marvell,armada380";
 
 	chosen {
 		bootargs = "console=ttyS0,115200";

target/linux/mvebu/image/cortexa9.mk

@@ -65,7 +65,6 @@ define Device/linksys_wrt1200ac
   DEVICE_ALT0_MODEL := Caiman
   DEVICE_DTS := armada-385-linksys-caiman
   DEVICE_PACKAGES += mwlwifi-firmware-88w8864
-  SUPPORTED_DEVICES := armada-385-linksys-caiman linksys,caiman
 endef
 TARGET_DEVICES += linksys_wrt1200ac
 
@@ -80,11 +79,10 @@ define Device/linksys_wrt1900acs
   DEVICE_ALT1_MODEL := Shelby
   DEVICE_DTS := armada-385-linksys-shelby
   DEVICE_PACKAGES += mwlwifi-firmware-88w8864
-  SUPPORTED_DEVICES := armada-385-linksys-shelby linksys,shelby
 endef
 TARGET_DEVICES += linksys_wrt1900acs
 
-define Device/linksys_wrt1900ac
+define Device/linksys_wrt1900ac-v1
   $(call Device/linksys)
   DEVICE_MODEL := WRT1900AC
   DEVICE_VARIANT := v1
@@ -93,11 +91,10 @@ define Device/linksys_wrt1900ac
   DEVICE_DTS := armada-xp-linksys-mamba
   DEVICE_PACKAGES += mwlwifi-firmware-88w8864
   KERNEL_SIZE := 3072k
-  SUPPORTED_DEVICES := armada-xp-linksys-mamba linksys,mamba
 endef
-TARGET_DEVICES += linksys_wrt1900ac
+TARGET_DEVICES += linksys_wrt1900ac-v1
 
-define Device/linksys_wrt1900acv2
+define Device/linksys_wrt1900ac-v2
   $(call Device/linksys)
   DEVICE_MODEL := WRT1900AC
   DEVICE_VARIANT := v2
@@ -105,9 +102,8 @@ define Device/linksys_wrt1900acv2
   DEVICE_ALT0_MODEL := Cobra
   DEVICE_DTS := armada-385-linksys-cobra
   DEVICE_PACKAGES += mwlwifi-firmware-88w8864
-  SUPPORTED_DEVICES := armada-385-linksys-cobra linksys,cobra
 endef
-TARGET_DEVICES += linksys_wrt1900acv2
+TARGET_DEVICES += linksys_wrt1900ac-v2
 
 define Device/linksys_wrt3200acm
   $(call Device/linksys)
@@ -116,7 +112,6 @@ define Device/linksys_wrt3200acm
   DEVICE_ALT0_MODEL := Rango
   DEVICE_DTS := armada-385-linksys-rango
   DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964
-  SUPPORTED_DEVICES := armada-385-linksys-rango linksys,rango
 endef
 TARGET_DEVICES += linksys_wrt3200acm
 
@@ -129,7 +124,6 @@ define Device/linksys_wrt32x
   DEVICE_PACKAGES += kmod-btmrvl kmod-mwifiex-sdio mwlwifi-firmware-88w8964
   KERNEL_SIZE := 3072k
   KERNEL := kernel-bin | append-dtb
-  SUPPORTED_DEVICES := armada-385-linksys-venom linksys,venom
 endef
 TARGET_DEVICES += linksys_wrt32x
 

target/linux/mvebu/patches-4.19/005-linksys_hardcode_nand_ecc_settings.patch

@@ -6,7 +6,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -160,6 +160,8 @@
+@@ -148,6 +148,8 @@
  		reg = <0>;
  		label = "pxa3xx_nand-0";
  		nand-rb = <0>;

target/linux/mvebu/patches-4.19/230-armada-xp-linksys-mamba-broken-idle.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-@@ -543,3 +543,7 @@
+@@ -532,3 +532,7 @@
  		};
  	};
  };

target/linux/mvebu/patches-4.19/231-armada-xp-linksys-mamba-wan.patch

@@ -1,8 +1,6 @@
-diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-index 8480a16919a0..8cf3c9d5205b 100644
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-@@ -299,7 +299,7 @@
+@@ -248,7 +248,7 @@
  
  			port@4 {
  				reg = <4>;

target/linux/mvebu/patches-4.19/241-linksys-use-eth0-as-cpu-port.patch

@@ -1,8 +1,6 @@
-diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
-index 827e82be2201..b6aecf4cc5eb 100644
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -109,7 +109,7 @@
+@@ -116,7 +116,7 @@
  };
  
  &eth2 {
@@ -11,7 +9,7 @@ index 827e82be2201..b6aecf4cc5eb 100644
  	phy-mode = "sgmii";
  	buffer-manager = <&bm>;
  	bm,pool-long = <2>;
-@@ -191,10 +191,10 @@
+@@ -200,10 +200,10 @@
  				label = "wan";
  			};
  

target/linux/mvebu/patches-4.19/250-adjust-compatible-for-linksys.patch

@@ -0,0 +1,68 @@
+--- a/arch/arm/boot/dts/armada-385-linksys-rango.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts
+@@ -12,8 +12,8 @@
+ 
+ / {
+ 	model = "Linksys WRT3200ACM";
+-	compatible = "linksys,rango", "linksys,armada385", "marvell,armada385",
+-		     "marvell,armada380";
++	compatible = "linksys,wrt3200acm", "linksys,rango", "linksys,armada385",
++		     "marvell,armada385", "marvell,armada380";
+ };
+ 
+ &expander0 {
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -22,9 +22,10 @@
+ #include "armada-xp-mv78230.dtsi"
+ 
+ / {
+-	model = "Linksys WRT1900AC";
+-	compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
+-		     "marvell,armadaxp", "marvell,armada-370-xp";
++	model = "Linksys WRT1900AC v1";
++	compatible = "linksys,wrt1900ac-v1", "linksys,mamba",
++		     "marvell,armadaxp-mv78230", "marvell,armadaxp",
++		     "marvell,armada-370-xp";
+ 
+ 	aliases {
+ 		led-boot = &led_power;
+--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+@@ -9,8 +9,9 @@
+ #include "armada-385-linksys.dtsi"
+ 
+ / {
+-	model = "Linksys WRT1900ACv2";
+-	compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",
++	model = "Linksys WRT1900AC v2";
++	compatible = "linksys,wrt1900ac-v2", "linksys,cobra",
++		     "linksys,armada385", "marvell,armada385",
+ 		     "marvell,armada380";
+ };
+ 
+--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+@@ -10,8 +10,8 @@
+ 
+ / {
+ 	model = "Linksys WRT1200AC";
+-	compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",
+-		     "marvell,armada380";
++	compatible = "linksys,wrt1200ac", "linksys,caiman", "linksys,armada385",
++		     "marvell,armada385", "marvell,armada380";
+ };
+ 
+ &expander0 {
+--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+@@ -10,7 +10,8 @@
+ 
+ / {
+ 	model = "Linksys WRT1900ACS";
+-	compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385",
++	compatible = "linksys,wrt1900acs", "linksys,shelby",
++		     "linksys,armada385", "marvell,armada385",
+ 		     "marvell,armada380";
+ };
+ 

target/linux/mvebu/patches-4.19/415-ARM-dts-armada388-clearfog-document-MPP-usage.patch

@@ -68,7 +68,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
 +*/
 --- a/arch/arm/boot/dts/armada-388-clearfog.dts
 +++ b/arch/arm/boot/dts/armada-388-clearfog.dts
-@@ -249,3 +249,53 @@
+@@ -236,3 +236,53 @@
  	 */
  	pinctrl-0 = <&spi1_pins &clearfog_spi1_cs_pins &mikro_spi_pins>;
  };

target/linux/mvebu/patches-5.4/005-linksys_hardcode_nand_ecc_settings.patch

@@ -6,7 +6,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -160,6 +160,8 @@
+@@ -148,6 +148,8 @@
  		reg = <0>;
  		label = "pxa3xx_nand-0";
  		nand-rb = <0>;

target/linux/mvebu/patches-5.4/230-armada-xp-linksys-mamba-broken-idle.patch

@@ -1,6 +1,6 @@
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-@@ -496,3 +496,7 @@
+@@ -485,3 +485,7 @@
  		};
  	};
  };

target/linux/mvebu/patches-5.4/231-armada-xp-linksys-mamba-wan.patch

@@ -1,8 +1,6 @@
-diff --git a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-index 8480a16919a0..8cf3c9d5205b 100644
 --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
 +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
-@@ -299,7 +299,7 @@
+@@ -387,7 +387,7 @@
  
  			port@4 {
  				reg = <4>;

target/linux/mvebu/patches-5.4/241-linksys-use-eth0-as-cpu-port.patch

@@ -1,8 +1,6 @@
-diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi
-index 827e82be2201..b6aecf4cc5eb 100644
 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
 +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
-@@ -109,7 +109,7 @@
+@@ -116,7 +116,7 @@
  };
  
  &eth2 {
@@ -11,7 +9,7 @@ index 827e82be2201..b6aecf4cc5eb 100644
  	phy-mode = "sgmii";
  	buffer-manager = <&bm>;
  	bm,pool-long = <2>;
-@@ -191,10 +191,10 @@
+@@ -200,10 +200,10 @@
  				label = "wan";
  			};
  

target/linux/mvebu/patches-5.4/250-adjust-compatible-for-linksys.patch

@@ -0,0 +1,68 @@
+--- a/arch/arm/boot/dts/armada-385-linksys-rango.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-rango.dts
+@@ -12,8 +12,8 @@
+ 
+ / {
+ 	model = "Linksys WRT3200ACM";
+-	compatible = "linksys,rango", "linksys,armada385", "marvell,armada385",
+-		     "marvell,armada380";
++	compatible = "linksys,wrt3200acm", "linksys,rango", "linksys,armada385",
++		     "marvell,armada385", "marvell,armada380";
+ };
+ 
+ &expander0 {
+--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
++++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+@@ -22,9 +22,10 @@
+ #include "armada-xp-mv78230.dtsi"
+ 
+ / {
+-	model = "Linksys WRT1900AC";
+-	compatible = "linksys,mamba", "marvell,armadaxp-mv78230",
+-		     "marvell,armadaxp", "marvell,armada-370-xp";
++	model = "Linksys WRT1900AC v1";
++	compatible = "linksys,wrt1900ac-v1", "linksys,mamba",
++		     "marvell,armadaxp-mv78230", "marvell,armadaxp",
++		     "marvell,armada-370-xp";
+ 
+ 	aliases {
+ 		led-boot = &led_power;
+--- a/arch/arm/boot/dts/armada-385-linksys-cobra.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-cobra.dts
+@@ -9,8 +9,9 @@
+ #include "armada-385-linksys.dtsi"
+ 
+ / {
+-	model = "Linksys WRT1900ACv2";
+-	compatible = "linksys,cobra", "linksys,armada385", "marvell,armada385",
++	model = "Linksys WRT1900AC v2";
++	compatible = "linksys,wrt1900ac-v2", "linksys,cobra",
++		     "linksys,armada385", "marvell,armada385",
+ 		     "marvell,armada380";
+ };
+ 
+--- a/arch/arm/boot/dts/armada-385-linksys-caiman.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-caiman.dts
+@@ -10,8 +10,8 @@
+ 
+ / {
+ 	model = "Linksys WRT1200AC";
+-	compatible = "linksys,caiman", "linksys,armada385", "marvell,armada385",
+-		     "marvell,armada380";
++	compatible = "linksys,wrt1200ac", "linksys,caiman", "linksys,armada385",
++		     "marvell,armada385", "marvell,armada380";
+ };
+ 
+ &expander0 {
+--- a/arch/arm/boot/dts/armada-385-linksys-shelby.dts
++++ b/arch/arm/boot/dts/armada-385-linksys-shelby.dts
+@@ -10,7 +10,8 @@
+ 
+ / {
+ 	model = "Linksys WRT1900ACS";
+-	compatible = "linksys,shelby", "linksys,armada385", "marvell,armada385",
++	compatible = "linksys,wrt1900acs", "linksys,shelby",
++		     "linksys,armada385", "marvell,armada385",
+ 		     "marvell,armada380";
+ };
+