Merge Official Source

package/boot/uboot-envtools/files/ath79

@@ -14,6 +14,7 @@ board=$(board_name)
 
 case "$board" in
 alfa-network,ap121f|\
+allnet,all-wap02860ac|\
 arduino,yun|\
 buffalo,bhr-4grv2|\
 devolo,magic-2-wifi|\

package/network/ipv6/map/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk

package/network/ipv6/map/files/map.sh

@@ -25,12 +25,9 @@ proto_map_setup() {
 	local iface="$2"
 	local link="map-$cfg"
 
-	# uncomment for legacy MAP0 mode
-	#export LEGACY=1
-
-	local type mtu ttl tunlink zone encaplimit
+	local type legacymap mtu ttl tunlink zone encaplimit
 	local rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset
-	json_get_vars type mtu ttl tunlink zone encaplimit
+	json_get_vars type legacymap mtu ttl tunlink zone encaplimit
 	json_get_vars rule ipaddr ip4prefixlen ip6prefix ip6prefixlen peeraddr ealen psidlen psid offset
 
 	[ "$zone" = "-" ] && zone=""
@@ -56,7 +53,7 @@ proto_map_setup() {
 	fi
 
 	echo "rule=$rule" > /tmp/map-$cfg.rules
-	RULE_DATA=$(mapcalc ${tunlink:-\*} $rule)
+	RULE_DATA=$(LEGACY="$legacymap" mapcalc ${tunlink:-\*} $rule)
 	if [ "$?" != 0 ]; then
 		proto_notify_error "$cfg" "INVALID_MAP_RULE"
 		proto_block_restart "$cfg"
@@ -106,7 +103,7 @@ proto_map_setup() {
 	elif [ "$type" = "map-t" -a -f "/proc/net/nat46/control" ]; then
 		proto_init_update "$link" 1
 		local style="MAP"
-		[ "$LEGACY" = 1 ] && style="MAP0"
+		[ "$legacymap" = 1 ] && style="MAP0"
 
 		echo add $link > /proc/net/nat46/control
 		local cfgstr="local.style $style local.v4 $(eval "echo \$RULE_${k}_IPV4PREFIX")/$(eval "echo \$RULE_${k}_PREFIX4LEN")"
@@ -229,6 +226,7 @@ proto_map_init_config() {
 	proto_config_add_int "psidlen"
 	proto_config_add_int "psid"
 	proto_config_add_int "offset"
+	proto_config_add_boolean "legacymap"
 
 	proto_config_add_string "tunlink"
 	proto_config_add_int "mtu"

package/network/services/dropbear/Config.in

@@ -95,4 +95,8 @@ config DROPBEAR_DBCLIENT
 	bool "Build dropbear with dbclient"
 	default y
 
+config DROPBEAR_SCP
+	bool "Build dropbear with scp"
+	default y
+
 endmenu

package/network/services/dropbear/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dropbear
 PKG_VERSION:=2020.80
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
@@ -31,7 +31,7 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_DROPBEAR_CURVE25519 CONFIG_DROPBEAR_ZLIB \
 	CONFIG_DROPBEAR_ED25519 CONFIG_DROPBEAR_CHACHA20POLY1305 \
 	CONFIG_DROPBEAR_UTMP CONFIG_DROPBEAR_PUTUTLINE \
-	CONFIG_DROPBEAR_DBCLIENT
+	CONFIG_DROPBEAR_DBCLIENT CONFIG_DROPBEAR_SCP
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -53,7 +53,9 @@ define Package/dropbear
   CATEGORY:=Base system
   TITLE:=Small SSH2 client/server
   DEPENDS:= +DROPBEAR_ZLIB:zlib
-  ALTERNATIVES:=100:/usr/bin/scp:/usr/sbin/dropbear
+  ALTERNATIVES:=
+  $(if $(CONFIG_DROPBEAR_SCP),ALTERNATIVES+= \
+	  100:/usr/bin/scp:/usr/sbin/dropbear,)
   $(if $(CONFIG_DROPBEAR_DBCLIENT),ALTERNATIVES+= \
 	  100:/usr/bin/ssh:/usr/sbin/dropbear,)
 
@@ -146,7 +148,7 @@ endef
 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \
-		PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,) dropbearkey scp" \
+		PROGRAMS="dropbear $(if $(CONFIG_DROPBEAR_DBCLIENT),dbclient,) dropbearkey $(if $(CONFIG_DROPBEAR_SCP),scp,)" \
 		MULTI=1 SCPPROGRESS=1
 	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
 		$(TARGET_CONFIGURE_OPTS) \

package/network/utils/ltq-dsl-base/Makefile

@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ltq-dsl-base
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 

package/network/utils/ltq-dsl-base/files/lib/functions/lantiq_dsl.sh

@@ -19,10 +19,10 @@ dsl_cmd() {
 	)
 }
 dsl_val() {
-	echo $(expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*')
+	expr "$1" : '.*'$2'=\([-\.[:alnum:]]*\).*'
 }
 dsl_string() {
-	echo $(expr "$1" : '.*'$2'=(\([A-Z0-9,]*\))')
+	expr "$1" : '.*'$2'=(\([A-Z0-9,]*\))'
 }
 
 #

target/linux/apm821xx/base-files/etc/hotplug.d/ieee80211/10_fix_wifi_mac

@@ -1,10 +1,10 @@
 #!/bin/ash
 
-[ "$ACTION" == "add" ] || exit 0
+[ "$ACTION" = "add" ] || exit 0
 
 PHYNBR=${DEVPATH##*/phy}
 
-[ -n $PHYNBR ] || exit 0
+[ -n "$PHYNBR" ] || exit 0
 
 . /lib/functions.sh
 . /lib/functions/system.sh
@@ -14,7 +14,7 @@ board=$(board_name)
 case "$board" in
 netgear,wndap620|\
 netgear,wndap660)
-	echo $(macaddr_add $(mtd_get_mac_ascii u-boot-env baseMAC) $(($PHYNBR + 1)) ) > /sys${DEVPATH}/macaddress
+	macaddr_add $(mtd_get_mac_ascii u-boot-env baseMAC) $(($PHYNBR + 1)) > /sys${DEVPATH}/macaddress
 	;;
 *)
 	;;

target/linux/ath79/dts/ar7240.dtsi

@@ -59,6 +59,8 @@
 };
 
 &eth0 {
+	status = "okay";
+
 	compatible = "qca,ar7240-eth", "syscon";
 
 	pll-data = <0x00110000 0x00001099 0x00991099>;

target/linux/ath79/dts/ar7240_buffalo_whr-g301n.dts

@@ -156,8 +156,6 @@
 };
 
 &eth0 {
-	status = "okay";
-
 	mtd-mac-address = <&art 0x120c>;
 };
 

target/linux/ath79/dts/ar7240_dlink_dir-615-e4.dts

@@ -139,10 +139,6 @@
 	};
 };
 
-&eth0 {
-	status = "okay";
-};
-
 &eth1 {
 	status = "okay";
 };

target/linux/ath79/dts/ar7240_netgear_wnr1000-v2.dts

@@ -174,8 +174,6 @@
 };
 
 &eth0 {
-	status = "okay";
-
 	mtd-mac-address = <&art 0x0>;
 };
 

target/linux/ath79/dts/ar7240_netgear_wnr612-v2.dtsi

@@ -106,8 +106,6 @@
 };
 
 &eth0 {
-	status = "okay";
-
 	mtd-mac-address = <&art 0x0>;
 };
 

target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi

@@ -9,6 +9,10 @@
 	};
 };
 
+&eth0 {
+	compatible = "syscon", "simple-mfd";
+};
+
 &eth1 {
 	mtd-mac-address = <&uboot 0x1fc00>;
 };

target/linux/ath79/dts/ar7240_tplink_tl-wr.dtsi

@@ -30,8 +30,6 @@
 };
 
 &eth0 {
-	status = "okay";
-
 	mtd-mac-address = <&uboot 0x1fc00>;
 	mtd-mac-address-increment = <(-1)>;
 };

target/linux/ath79/dts/ar7241.dtsi

@@ -77,6 +77,8 @@
 };
 
 &eth1 {
+	status = "okay";
+
 	compatible = "qca,ar7241-eth", "syscon";
 
 	pll-data = <0x00110000 0x00001099 0x00991099>;

target/linux/ath79/dts/ar7241_netgear_wnr2000-v3.dts

@@ -183,9 +183,8 @@
 };
 
 &eth1 {
-	status = "okay";
-
 	compatible = "qca,ar7241-eth", "syscon", "simple-mfd";
+
 	mtd-mac-address = <&art 0x6>;
 };
 

target/linux/ath79/dts/ar7241_netgear_wnr2200.dtsi

@@ -159,9 +159,8 @@
 };
 
 &eth1 {
-	status = "okay";
-
 	compatible = "qca,ar7241-eth", "syscon", "simple-mfd";
+
 	mtd-mac-address = <&art 0x6>;
 };
 

target/linux/ath79/dts/ar7241_tplink.dtsi

@@ -103,8 +103,6 @@
 };
 
 &eth1 {
-	status = "okay";
-
 	mtd-mac-address = <&uboot 0x1fc00>;
 	mtd-mac-address-increment = <1>;
 };

target/linux/ath79/dts/ar7241_tplink_tl-wr842n-v1.dts

@@ -150,8 +150,6 @@
 };
 
 &eth1 {
-	status = "okay";
-
 	mtd-mac-address = <&uboot 0x1fc00>;
 	mtd-mac-address-increment = <1>;
 };

target/linux/ath79/dts/ar7241_ubnt_unifi.dts

@@ -126,7 +126,5 @@
 };
 
 &eth1 {
-	status = "okay";
-
 	compatible = "syscon", "simple-mfd";
 };

target/linux/ath79/dts/qca9558_allnet_all-wap02860ac.dts

@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "qca955x.dtsi"
+
+/ {
+	model = "ALLNET ALL-WAP02860AC";
+	compatible = "allnet,all-wap02860ac", "qca,qca9558";
+
+	aliases {
+		label-mac-device = &eth0;
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			linux,code = <KEY_RESTART>;
+			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			label = "all-wap02860ac:amber:power";
+			gpios = <&gpio 22 GPIO_ACTIVE_LOW>;
+			default-state = "on";
+		};
+
+		wlan2g {
+			label = "all-wap02860ac:blue:wlan2g";
+			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy1tpt";
+		};
+
+		wlan5g {
+			label = "all-wap02860ac:green:wlan5g";
+			gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0tpt";
+		};
+
+		wps {
+			label = "all-wap02860ac:blue:wps";
+			gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	pll-data = <0x8e000000 0x80000101 0x80001313>;
+	phy-handle = <&phy5>;
+	phy-mode = "rgmii-rxid";
+
+	mtd-mac-address = <&art 0x0>;
+};
+
+&mdio0 {
+	status = "okay";
+
+	phy5: ethernet-phy@5 {
+		reg = <5>;
+		eee-broken-100tx;
+		eee-broken-1000t;
+	};
+};
+
+&pcie0 {
+	status = "okay";
+
+	wifi@0,0 {
+		compatible = "qcom,ath10k";
+		reg = <0 0 0 0 0>;
+	};
+};
+
+&pll {
+	clocks = <&extosc>;
+};
+
+&spi {
+	status = "okay";
+
+	num-cs = <1>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x000000 0x040000>;
+				read-only;
+			};
+
+			partition@40000 {
+				label = "u-boot-env";
+				reg = <0x040000 0x010000>;
+			};
+
+			partition@50000 {
+				label = "custom";
+				reg = <0x050000 0x050000>;
+				read-only;
+			};
+
+			partition@a0000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x0a0000 0xcd0000>;
+			};
+
+			partition@d70000 {
+				label = "failsafe";
+				reg = <0xd70000 0x280000>;
+				read-only;
+			};
+
+			art: partition@ff0000 {
+				label = "art";
+				reg = <0xff0000 0x010000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&uart {
+	status = "okay";
+};
+
+&wmac {
+	status = "okay";
+
+	mtd-cal-data = <&art 0x1000>;
+	mtd-mac-address = <&art 0x0>;
+	mtd-mac-address-increment = <1>;
+	qca-no-eeprom;
+};

target/linux/ath79/dts/qca9563_tplink_tl-wpa8630-v1.dts

@@ -12,15 +12,6 @@
 	};
 };
 
-&keys {
-	wifi {
-		label = "WiFi button";
-		linux,code = <KEY_RFKILL>;
-		gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-		debounce-interval = <60>;
-	};
-};
-
 &partitions {
 	uboot: partition@0 {
 		label = "u-boot";

target/linux/ath79/dts/qca9563_tplink_tl-wpa8630.dtsi

@@ -13,7 +13,7 @@
 		led-upgrade = &led_power;
 	};
 
-	keys: keys {
+	keys {
 		compatible = "gpio-keys";
 
 		reset {
@@ -36,6 +36,13 @@
 			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
 			debounce-interval = <60>;
 		};
+
+		wifi {
+			label = "WiFi button";
+			linux,code = <KEY_RFKILL>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
+		};
 	};
 
 	leds {

target/linux/ath79/dts/qca9563_tplink_tl-wpa8630p-v2.dtsi

@@ -17,15 +17,6 @@
 	};
 };
 
-&keys {
-	wps {
-		label = "WPS button";
-		linux,code = <KEY_WPS_BUTTON>;
-		gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
-		debounce-interval = <60>;
-	};
-};
-
 &partitions {
 	partition@0 {
 		label = "factory-uboot";

target/linux/ath79/generic/base-files/etc/board.d/02_network

@@ -11,6 +11,7 @@ ath79_setup_interfaces()
 	case "$board" in
 	adtran,bsap1800-v2|\
 	adtran,bsap1840|\
+	allnet,all-wap02860ac|\
 	alfa-network,ap121f|\
 	arduino,yun|\
 	aruba,ap-105|\

target/linux/ath79/generic/base-files/etc/hotplug.d/firmware/11-ath10k-caldata

@@ -10,6 +10,11 @@ board=$(board_name)
 case "$FIRMWARE" in
 "ath10k/cal-pci-0000:00:00.0.bin")
 	case $board in
+	allnet,all-wap02860ac|\
+	glinet,gl-x750)
+		caldata_extract "art" 0x5000 0x844
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2)
+		;;
 	avm,fritz1750e|\
 	avm,fritzdvbc)
 		caldata_extract "urlader" 0x198a 0x844
@@ -72,10 +77,6 @@ case "$FIRMWARE" in
 		caldata_extract "art" 0x5000 0x844
 		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +1)
 		;;
-	glinet,gl-x750)
-		caldata_extract "art" 0x5000 0x844
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0x0) +2)
-		;;
 	nec,wg800hp)
 		caldata_extract "art" 0x5000 0x844
 		ath10k_patch_mac $(mtd_get_mac_text board_data 0x880)

target/linux/ath79/image/generic.mk

@@ -210,6 +210,15 @@ define Device/alfa-network_ap121f
 endef
 TARGET_DEVICES += alfa-network_ap121f
 
+define Device/allnet_all-wap02860ac
+  SOC := qca9558
+  DEVICE_VENDOR := ALLNET
+  DEVICE_MODEL := ALL-WAP02860AC
+  DEVICE_PACKAGES := ath10k-firmware-qca988x-ct kmod-ath10k-ct
+  IMAGE_SIZE := 13120k
+endef
+TARGET_DEVICES += allnet_all-wap02860ac
+
 define Device/arduino_yun
   SOC := ar9331
   DEVICE_VENDOR := Arduino

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

@@ -55,8 +55,8 @@ bcm53xx_setup_interfaces()
 		# vlan2ports=4 5u
 		# and early Netgear R8000 was using
 		# vlan1ports=3 2 1 0 5 7 8*
-		vlan1ports="$(echo $(nvram get vlan1ports | tr " " "\n" | sort))"
-		vlan2ports="$(echo $(nvram get vlan2ports | tr " " "\n" | sort))"
+		vlan1ports="$(nvram get vlan1ports | tr " " "\n" | sort)"
+		vlan2ports="$(nvram get vlan2ports | tr " " "\n" | sort)"
 		if echo "$vlan1ports" | egrep -q "^1 2 3 4 5" && \
 		   echo "$vlan2ports" | egrep -q "^0 5"; then
 			ucidef_add_switch "switch0" \

target/linux/bcm63xx/patches-5.4/500-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch

@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -693,6 +693,52 @@ static const struct board_info __initcon
+@@ -439,6 +439,52 @@ static const struct board_info __initcon
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {

target/linux/bcm63xx/patches-5.4/501-board_bcm6318-brcm-bcm96318ref.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -50,6 +50,53 @@ static struct board_info __initdata boar
+@@ -49,6 +49,53 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  
  /*
@@ -54,7 +54,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1409,6 +1456,9 @@ static const struct board_info __initcon
+@@ -410,6 +457,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
  	&board_cvg834g,
  #endif /* CONFIG_BCM63XX_CPU_3368 */
@@ -63,12 +63,12 @@
 +#endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
- 	&board_AR5381u,
-@@ -1483,6 +1533,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
+@@ -444,6 +494,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6318
 +	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
- 	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
+ 	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/502-board_bcm6318-brcm-bcm96318ref-p300.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -94,6 +94,48 @@ static struct board_info __initdata boar
+@@ -93,6 +93,48 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -49,7 +49,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1458,6 +1500,7 @@ static const struct board_info __initcon
+@@ -459,6 +501,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
@@ -57,11 +57,11 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -1534,6 +1577,7 @@ static struct of_device_id const bcm963x
+@@ -495,6 +538,7 @@ static struct of_device_id const bcm963x
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
 +	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
- 	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
+ 	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/503-board_bcm6318-d-link-dsl-275xb-d.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -138,6 +138,72 @@ static struct board_info __initdata boar
+@@ -135,6 +135,72 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -73,7 +73,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1921,6 +1987,7 @@ static const struct board_info __initcon
+@@ -502,6 +568,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
@@ -81,11 +81,11 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2010,6 +2077,7 @@ static struct of_device_id const bcm963x
+@@ -539,6 +606,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
 +	{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
- 	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
+ 	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/504-board_bcm6318-sagem-fast-2704n.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -204,6 +204,49 @@ static struct board_info __initdata boar
+@@ -201,6 +201,49 @@ static struct board_info __initdata boar
  		.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
  	},
  };
@@ -50,7 +50,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2083,6 +2126,7 @@ static const struct board_info __initcon
+@@ -569,6 +612,7 @@ static const struct board_info __initcon
  	&board_96318ref,
  	&board_96318ref_p300,
  	&board_dsl_2751b_d1,
@@ -58,11 +58,11 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2176,6 +2220,7 @@ static struct of_device_id const bcm963x
+@@ -607,6 +651,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
  	{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },
 +	{ .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, },
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
- 	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
+ 	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/505-board_bcm6318-comtrend-ar-5315u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -139,6 +139,65 @@ static struct board_info __initdata boar
+@@ -136,6 +136,65 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -66,7 +66,7 @@
  static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
  	{ .offset = 96, .value = 0x2046 },
  	{ .offset = 97, .value = 0xfe9d },
-@@ -2471,6 +2530,7 @@ static const struct board_info __initcon
+@@ -611,6 +670,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
@@ -74,7 +74,7 @@
  	&board_dsl_2751b_d1,
  	&board_FAST2704N,
  #endif /* CONFIG_BCM63XX_CPU_6318 */
-@@ -2572,6 +2632,7 @@ static struct of_device_id const bcm963x
+@@ -650,6 +710,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },

target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-96328avng-reference-board.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -64,6 +64,32 @@ static struct board_info __initdata boar
+@@ -321,6 +321,32 @@ static struct board_info __initdata boar
  		.use_fullspeed		= 0,
  		.port_no		= 0,
  	},

target/linux/bcm63xx/patches-5.4/522-MIPS-BCM63XX-add-963281TAN-reference-board.patch

@@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -91,6 +91,39 @@ static struct board_info __initdata boar
+@@ -348,6 +348,39 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -49,16 +49,16 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -889,6 +922,7 @@ static const struct board_info __initcon
- #endif /* CONFIG_BCM63XX_CPU_3368 */
+@@ -702,6 +735,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_963281TAN,
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -945,6 +979,7 @@ static struct of_device_id const bcm963x
- #ifdef CONFIG_BCM63XX_CPU_6318
+@@ -741,6 +775,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, },
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
 +	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },

target/linux/bcm63xx/patches-5.4/523-board_bcm6328-d-link-dsl-274xb-f.patch

@@ -10,7 +10,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -124,6 +124,50 @@ static struct board_info __initdata boar
+@@ -381,6 +381,50 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -61,7 +61,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -923,6 +967,7 @@ static const struct board_info __initcon
+@@ -736,6 +780,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
@@ -69,7 +69,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -981,6 +1026,7 @@ static struct of_device_id const bcm963x
+@@ -777,6 +822,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/524-board_bcm6328-adb-a4001n1.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -125,6 +125,49 @@ static struct board_info __initdata boar
+@@ -382,6 +382,49 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
  	.name = "AW4339U",
  	.expected_cpu_id = 0x6328,
-@@ -1074,6 +1117,7 @@ static const struct board_info __initcon
+@@ -780,6 +823,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
@@ -58,8 +58,8 @@
  	&board_dsl_274xb_f1,
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1138,6 +1182,7 @@ static struct of_device_id const bcm963x
- #ifdef CONFIG_BCM63XX_CPU_6318
+@@ -820,6 +864,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, },
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
 +	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },

target/linux/bcm63xx/patches-5.4/525-board_bcm6328-comtrend-ar-5387un.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -92,6 +92,78 @@ static struct board_info __initdata boar
+@@ -349,6 +349,78 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -79,15 +79,15 @@
  static struct board_info __initdata board_963281TAN = {
  	.name = "963281TAN",
  	.expected_cpu_id = 0x6328,
-@@ -1116,6 +1188,7 @@ static const struct board_info __initcon
- #endif /* CONFIG_BCM63XX_CPU_3368 */
+@@ -822,6 +894,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
-@@ -1185,6 +1258,7 @@ static struct of_device_id const bcm963x
+@@ -867,6 +940,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/526-board_bcm6328-comtrend-ar-5381u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -92,6 +92,60 @@ static struct board_info __initdata boar
+@@ -349,6 +349,60 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -61,15 +61,15 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
  	{ .offset = 2, .value = 0x05bb },
  	{ .offset = 65, .value = 0x1204 },
-@@ -1188,6 +1242,7 @@ static const struct board_info __initcon
- #endif /* CONFIG_BCM63XX_CPU_3368 */
+@@ -894,6 +948,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,
-@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x
+@@ -940,6 +995,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/527-board_bcm6328-sagem-fast-2704-v2.patch

@@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -338,6 +338,42 @@ static struct board_info __initdata boar
+@@ -594,6 +594,42 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -55,7 +55,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1349,6 +1385,7 @@ static const struct board_info __initcon
+@@ -953,6 +989,7 @@ static const struct board_info __initcon
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
@@ -63,7 +63,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1422,6 +1459,7 @@ static struct of_device_id const bcm963x
+@@ -998,6 +1035,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
  	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },

target/linux/bcm63xx/patches-5.4/528-board_bcm6328-adb-a4001n.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -343,6 +343,49 @@ static struct board_info __initdata boar
+@@ -508,6 +508,49 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_A4001N1 = {
  	.name = "963281T_TEF",
  	.expected_cpu_id = 0x6328,
-@@ -1884,6 +1927,7 @@ static const struct board_info __initcon
+@@ -987,6 +1030,7 @@ static const struct board_info __initcon
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
@@ -58,8 +58,8 @@
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
-@@ -1968,6 +2012,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
+@@ -1029,6 +1073,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, },
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
 +	{ .compatible = "adb,a4001n", .data = &board_A4001N, },

target/linux/bcm63xx/patches-5.4/529-board_bcm6328-nucom-r5010un-v2.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -617,6 +617,50 @@ static struct board_info __initdata boar
+@@ -673,6 +673,50 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -51,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2190,6 +2234,7 @@ static const struct board_info __initcon
+@@ -1034,6 +1078,7 @@ static const struct board_info __initcon
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
@@ -59,7 +59,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -2284,6 +2329,7 @@ static struct of_device_id const bcm963x
+@@ -1080,6 +1125,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
  	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },

target/linux/bcm63xx/patches-5.4/530-board_bcm6328-sercomm-ad1018.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -352,6 +352,71 @@ static struct board_info __initdata boar
+@@ -349,6 +349,71 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -72,7 +72,7 @@
  static struct sprom_fixup __initdata ar5381u_fixups[] = {
  	{ .offset = 97, .value = 0xfee5 },
  	{ .offset = 98, .value = 0x157c },
-@@ -2536,6 +2601,7 @@ static const struct board_info __initcon
+@@ -1071,6 +1136,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -80,7 +80,7 @@
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
-@@ -2646,6 +2712,8 @@ static struct of_device_id const bcm963x
+@@ -1127,6 +1193,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
  	{ .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, },
  	{ .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, },

target/linux/bcm63xx/patches-5.4/531-board-bcm6328-adb-pdg-a4001n-a-000-1a1-ax.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -619,6 +619,49 @@ static struct board_info __initdata boar
+@@ -616,6 +616,49 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_A4001N1 = {
  	.name = "963281T_TEF",
  	.expected_cpu_id = 0x6328,
-@@ -2757,6 +2800,7 @@ static const struct board_info __initcon
+@@ -1141,6 +1184,7 @@ static const struct board_info __initcon
  	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N,
@@ -58,7 +58,7 @@
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
-@@ -2861,6 +2905,7 @@ static struct of_device_id const bcm963x
+@@ -1186,6 +1230,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },

target/linux/bcm63xx/patches-5.4/541-board-bcm6338-d-link-dsl-2640u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -98,6 +98,19 @@ static struct board_info __initdata boar
+@@ -858,6 +858,19 @@ static struct board_info __initdata boar
  		.force_duplex_full	= 1,
  	},
  };
@@ -20,7 +20,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -481,6 +494,7 @@ static const struct board_info __initcon
+@@ -1193,6 +1206,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
  	&board_96338w,
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -519,6 +533,7 @@ static struct of_device_id const bcm963x
+@@ -1244,6 +1258,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
  	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },

target/linux/bcm63xx/patches-5.4/542-board_bcm6338-dynalink-rta1320.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -111,6 +111,19 @@ static struct board_info __initdata boar
+@@ -871,6 +871,19 @@ static struct board_info __initdata boar
  		.force_duplex_full = 1,
  	},
  };
@@ -20,7 +20,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -647,6 +660,7 @@ static const struct board_info __initcon
+@@ -1207,6 +1220,7 @@ static const struct board_info __initcon
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -692,6 +706,7 @@ static struct of_device_id const bcm963x
+@@ -1258,6 +1272,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
  	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },

target/linux/bcm63xx/patches-5.4/551-board_bcm6345-dynalink-rta770bw-rta770w.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -406,6 +406,19 @@ static struct board_info __initdata boar
+@@ -894,6 +894,19 @@ static struct board_info __initdata boar
  	.name				= "96345GW2",
  	.expected_cpu_id		= 0x6345,
  };
@@ -20,7 +20,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1256,6 +1269,7 @@ static const struct board_info __initcon
+@@ -1224,6 +1237,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
-@@ -1325,6 +1339,8 @@ static struct of_device_id const bcm963x
+@@ -1277,6 +1291,8 @@ static struct of_device_id const bcm963x
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },

target/linux/bcm63xx/patches-5.4/561-board-bcm6348-D4PW.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -294,6 +294,21 @@ static struct board_info __initdata boar
+@@ -1093,6 +1093,21 @@ static struct board_info __initdata boar
  
  	.has_ohci0 = 1,
  };
@@ -22,7 +22,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -429,6 +444,7 @@ static const struct board_info __initcon
+@@ -1248,6 +1263,7 @@ static const struct board_info __initcon
  	&board_DV201AMR,
  	&board_96348gw_a,
  	&board_rta1025w_16,
@@ -30,7 +30,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -461,6 +477,7 @@ static struct of_device_id const bcm963x
+@@ -1300,6 +1316,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },

target/linux/bcm63xx/patches-5.4/562-board_bcm6348-t-com-speedport-w-500v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -322,6 +322,36 @@ static struct board_info __initdata boar
+@@ -1108,6 +1108,36 @@ static struct board_info __initdata boar
  		.force_duplex_full = 1,
  	},
  };
@@ -37,7 +37,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -542,6 +572,7 @@ static const struct board_info __initcon
+@@ -1264,6 +1294,7 @@ static const struct board_info __initcon
  	&board_96348gw_a,
  	&board_rta1025w_16,
  	&board_96348_D4PW,
@@ -45,7 +45,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -584,6 +615,7 @@ static struct of_device_id const bcm963x
+@@ -1321,6 +1352,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },

target/linux/bcm63xx/patches-5.4/563-board_bcm6348-tecom-gw6000-gw6200.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -216,6 +216,46 @@ static struct board_info __initdata boar
+@@ -1002,6 +1002,46 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
@@ -47,7 +47,7 @@
  static struct board_info __initdata board_FAST2404 = {
  	.name				= "F@ST2404",
  	.expected_cpu_id		= 0x6348,
-@@ -565,6 +605,8 @@ static const struct board_info __initcon
+@@ -1287,6 +1327,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
  	&board_96348gw,
@@ -56,7 +56,7 @@
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
-@@ -616,6 +658,8 @@ static struct of_device_id const bcm963x
+@@ -1353,6 +1395,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },
  	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },

target/linux/bcm63xx/patches-5.4/564-board-bcm6348-telsey-magic.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -392,6 +392,30 @@ static struct board_info __initdata boar
+@@ -1178,6 +1178,30 @@ static struct board_info __initdata boar
  		.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
  	},
  };
@@ -31,7 +31,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -615,6 +639,7 @@ static const struct board_info __initcon
+@@ -1337,6 +1361,7 @@ static const struct board_info __initcon
  	&board_rta1025w_16,
  	&board_96348_D4PW,
  	&board_spw500v,
@@ -39,7 +39,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -660,6 +685,7 @@ static struct of_device_id const bcm963x
+@@ -1397,6 +1422,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
  	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
  	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },

target/linux/bcm63xx/patches-5.4/565-board_bcm6348-bt-voyager-2500v-bb.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -429,6 +429,27 @@ static struct board_info __initdata boar
+@@ -1202,6 +1202,27 @@ static struct board_info __initdata boar
  		.force_duplex_full = 1,
  	},
  };
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -693,6 +714,7 @@ static const struct board_info __initcon
+@@ -1362,6 +1383,7 @@ static const struct board_info __initcon
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
@@ -36,7 +36,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -733,6 +755,7 @@ static struct of_device_id const bcm963x
+@@ -1414,6 +1436,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -44,7 +44,7 @@
  	{ .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
  	{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -794,6 +817,22 @@ void __init board_bcm963xx_init(void)
+@@ -1469,6 +1492,22 @@ void __init board_bcm963xx_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);

target/linux/bcm63xx/patches-5.4/566-board_bcm6348-bt-voyager-2110.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -206,6 +206,22 @@ static struct board_info __initdata boar
+@@ -979,6 +979,22 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -23,7 +23,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -715,6 +731,7 @@ static const struct board_info __initcon
+@@ -1384,6 +1400,7 @@ static const struct board_info __initcon
  	&board_spw500v,
  	&board_96348sv,
  	&board_V2500V_BB,
@@ -31,7 +31,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -755,6 +772,7 @@ static struct of_device_id const bcm963x
+@@ -1436,6 +1453,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },

target/linux/bcm63xx/patches-5.4/568-board_bcm6348-comtrend-ct-536plus-ct-5621.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -222,6 +222,30 @@ static struct board_info __initdata boar
+@@ -995,6 +995,30 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -31,7 +31,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -732,6 +756,7 @@ static const struct board_info __initcon
+@@ -1401,6 +1425,7 @@ static const struct board_info __initcon
  	&board_96348sv,
  	&board_V2500V_BB,
  	&board_V2110,
@@ -39,7 +39,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -774,6 +799,8 @@ static struct of_device_id const bcm963x
+@@ -1455,6 +1480,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
  	{ .compatible = "bt,voyager-2110", .data = &board_V2110, },
  	{ .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, },

target/linux/bcm63xx/patches-5.4/569-board_bcm6348-comtrend-ct-5365.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -246,6 +246,29 @@ static struct board_info __initdata boar
+@@ -1019,6 +1019,29 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -30,7 +30,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -758,6 +781,7 @@ static const struct board_info __initcon
+@@ -1426,6 +1449,7 @@ static const struct board_info __initcon
  	&board_V2500V_BB,
  	&board_V2110,
  	&board_ct536_ct5621,
@@ -38,7 +38,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -801,6 +825,7 @@ static struct of_device_id const bcm963x
+@@ -1481,6 +1505,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,voyager-2110", .data = &board_V2110, },
  	{ .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, },
  	{ .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, },

target/linux/bcm63xx/patches-5.4/570-board_bcm6348-telsey-cpva502plus.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -222,6 +222,34 @@ static struct board_info __initdata boar
+@@ -995,6 +995,34 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -35,7 +35,7 @@
  static struct board_info __initdata board_ct536_ct5621 = {
  	.name = "CT536_CT5621",
  	.expected_cpu_id = 0x6348,
-@@ -782,6 +810,7 @@ static const struct board_info __initcon
+@@ -1450,6 +1478,7 @@ static const struct board_info __initcon
  	&board_V2110,
  	&board_ct536_ct5621,
  	&board_96348A_122,
@@ -43,7 +43,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -835,6 +864,7 @@ static struct of_device_id const bcm963x
+@@ -1515,6 +1544,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
  	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
  	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },

target/linux/bcm63xx/patches-5.4/571-board_bcm6348-netgear-dg834g-v4.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -555,6 +555,23 @@ static struct board_info __initdata boar
+@@ -1225,6 +1225,23 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
@@ -24,7 +24,7 @@
  static struct board_info __initdata board_96348_D4PW = {
  	.name = "D-4P-W",
  	.expected_cpu_id = 0x6348,
-@@ -997,6 +1014,7 @@ static const struct board_info __initcon
+@@ -1479,6 +1496,7 @@ static const struct board_info __initcon
  	&board_ct536_ct5621,
  	&board_96348A_122,
  	&board_CPVA502plus,
@@ -32,7 +32,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -1052,6 +1070,7 @@ static struct of_device_id const bcm963x
+@@ -1540,6 +1558,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },

target/linux/bcm63xx/patches-5.4/572-board_bcm6348-sagem-fast-2604.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -489,6 +489,22 @@ static struct board_info __initdata boar
+@@ -1159,6 +1159,22 @@ static struct board_info __initdata boar
  	.has_ehci0			= 1,
  };
  
@@ -23,7 +23,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
  	.name				= "RTA1025W_16",
  	.expected_cpu_id		= 0x6348,
-@@ -1077,6 +1093,7 @@ static const struct board_info __initcon
+@@ -1485,6 +1501,7 @@ static const struct board_info __initcon
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
@@ -31,7 +31,7 @@
  	&board_DV201AMR,
  	&board_96348gw_a,
  	&board_rta1025w_16,
-@@ -1151,6 +1168,7 @@ static struct of_device_id const bcm963x
+@@ -1560,6 +1577,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
   	{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },

target/linux/bcm63xx/patches-5.4/573-board_bcm6348-asmax-ar-1004g.patch

@@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -617,6 +617,21 @@ static struct board_info __initdata boar
+@@ -979,6 +979,21 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
  	.name = "V2110",
-@@ -1582,6 +1597,7 @@ static const struct board_info __initcon
+@@ -1514,6 +1529,7 @@ static const struct board_info __initcon
  	&board_96348A_122,
  	&board_CPVA502plus,
  	&board_96348W3,
@@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -1643,6 +1659,7 @@ static struct of_device_id const bcm963x
+@@ -1561,6 +1577,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  #ifdef CONFIG_BCM63XX_CPU_6348

target/linux/bcm63xx/patches-5.4/601-board-bcm6358-DWV-S0_fixes.patch

@@ -1,10 +1,10 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -613,6 +613,7 @@ static struct board_info __initdata boar
+@@ -1468,6 +1468,7 @@ static struct board_info __initdata boar
  	},
  
  	.has_ohci0			= 1,
 +	.has_ehci0			= 1,
  };
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  
- /* D-Link DSL-274xB revison C2/C3 */

target/linux/bcm63xx/patches-5.4/602-board-bcm6358-sfr-neufbox-4.patch

@@ -1,8 +1,8 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -416,6 +416,56 @@ static struct board_info __initdata boar
- 
+@@ -1470,6 +1470,56 @@ static struct board_info __initdata boar
  	.has_ohci0			= 1,
+ 	.has_ehci0			= 1,
  };
 +
 +static struct board_info __initdata board_nb4_ser_r0 = {
@@ -57,7 +57,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -451,6 +501,8 @@ static const struct board_info __initcon
+@@ -1537,6 +1587,8 @@ static const struct board_info __initcon
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
@@ -66,7 +66,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -494,6 +546,8 @@ static struct of_device_id const bcm963x
+@@ -1613,6 +1665,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,a226m", .data = &board_DWVS0, },
  	{ .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, },
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },

target/linux/bcm63xx/patches-5.4/603-board-bcm6358-telsey-cpva642.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -382,6 +382,23 @@ static struct board_info __initdata boar
+@@ -1422,6 +1422,23 @@ static struct board_info __initdata boar
  	.num_usbh_ports			= 2,
  };
  
@@ -24,7 +24,7 @@
  static struct board_info __initdata board_AGPFS0 = {
  	.name				= "AGPF-S0",
  	.expected_cpu_id		= 0x6358,
-@@ -514,6 +531,7 @@ static const struct board_info __initcon
+@@ -1586,6 +1603,7 @@ static const struct board_info __initcon
  	&board_96358vw,
  	&board_96358vw2,
  	&board_AGPFS0,
@@ -32,7 +32,7 @@
  	&board_DWVS0,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
-@@ -563,6 +581,7 @@ static struct of_device_id const bcm963x
+@@ -1667,6 +1685,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
  	{ .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, },
  	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },

target/linux/bcm63xx/patches-5.4/604-board_bcm6358-d-link-dsl-274xb-c.patch

@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -447,6 +447,22 @@ static struct board_info __initdata boar
- 	.has_ohci0			= 1,
+@@ -1488,6 +1488,22 @@ static struct board_info __initdata boar
+ 	.has_ehci0			= 1,
  };
  
 +/* D-Link DSL-274xB revison C2/C3 */
@@ -23,7 +23,7 @@
  static struct board_info __initdata board_nb4_ser_r0 = {
  	.name = "NB4-SER-r0",
  	.expected_cpu_id = 0x6358,
-@@ -533,6 +549,7 @@ static const struct board_info __initcon
+@@ -1605,6 +1621,7 @@ static const struct board_info __initcon
  	&board_AGPFS0,
  	&board_CPVA642,
  	&board_DWVS0,
@@ -31,7 +31,7 @@
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -574,6 +591,7 @@ static struct of_device_id const bcm963x
+@@ -1678,6 +1695,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
  	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/605-board_bcm6358-huawei-echolife-hg553.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -606,6 +606,31 @@ static struct board_info __initdata boar
+@@ -1553,6 +1553,31 @@ static struct board_info __initdata boar
  		.force_duplex_full = 1,
  	},
  };
@@ -32,7 +32,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -650,6 +675,7 @@ static const struct board_info __initcon
+@@ -1624,6 +1649,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
@@ -40,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -695,6 +721,7 @@ static struct of_device_id const bcm963x
+@@ -1697,6 +1723,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/606-board_bcm6358-t-com-speedport-w-303v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -644,6 +644,20 @@ static struct board_info __initdata boar
+@@ -1578,6 +1578,20 @@ static struct board_info __initdata boar
  		.pci_dev = 1,
  	},
  };
@@ -21,7 +21,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -690,6 +704,7 @@ static const struct board_info __initcon
+@@ -1650,6 +1664,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_HW553,
@@ -29,7 +29,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -743,6 +758,7 @@ static struct of_device_id const bcm963x
+@@ -1730,6 +1745,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
  	{ .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, },
  	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },

target/linux/bcm63xx/patches-5.4/607-board_bcm6358-comtrend-ct-6373.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -853,6 +853,30 @@ static struct board_info __initdata boar
+@@ -1554,6 +1554,30 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -31,7 +31,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name = "HW553",
  	.expected_cpu_id = 0x6358,
-@@ -1025,6 +1049,7 @@ static const struct board_info __initcon
+@@ -1663,6 +1687,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
@@ -39,7 +39,7 @@
  	&board_HW553,
  	&board_spw303v,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -1084,6 +1109,7 @@ static struct of_device_id const bcm963x
+@@ -1736,6 +1761,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
  	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/608-board_bcm6358-d-link-dva-g3810bn-tl.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -915,6 +915,31 @@ static struct board_info __initdata boar
+@@ -1616,6 +1616,31 @@ static struct board_info __initdata boar
  		.use_internal_phy = 1,
  	},
  };
@@ -32,15 +32,15 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1052,6 +1077,7 @@ static const struct board_info __initcon
+@@ -1690,6 +1715,7 @@ static const struct board_info __initcon
  	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,
 +	&board_DVAG3810BN,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
- #ifdef CONFIG_BCM63XX_CPU_6368
- 	&board_96368mvwg,
-@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x
+ };
+ 
+@@ -1764,6 +1790,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/609-board_bcm6358-huawei-echolife-hg556.patch

@@ -8,7 +8,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1100,6 +1101,94 @@ static struct board_info __initdata boar
+@@ -1603,6 +1604,94 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -103,7 +103,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
  	.name = "96358-502V",
-@@ -1304,6 +1393,9 @@ static const struct board_info __initcon
+@@ -1714,6 +1803,9 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
  	&board_HW553,
@@ -113,7 +113,7 @@
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -1377,6 +1469,9 @@ static struct of_device_id const bcm963x
+@@ -1792,6 +1884,9 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, },
  	{ .compatible = "huawei,echolife-hg553", .data = &board_HW553, },

target/linux/bcm63xx/patches-5.4/610-board_bcm6359-huawei-echolife-hg520v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1218,6 +1218,36 @@ static struct board_info __initdata boar
+@@ -1579,6 +1579,36 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -37,7 +37,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name = "HW553",
  	.expected_cpu_id = 0x6358,
-@@ -1901,6 +1931,7 @@ static const struct board_info __initcon
+@@ -1802,6 +1832,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
@@ -45,7 +45,7 @@
  	&board_HW553,
  	&board_HW556_A,
  	&board_HW556_B,
-@@ -1991,6 +2022,7 @@ static struct of_device_id const bcm963x
+@@ -1883,6 +1914,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, },

target/linux/bcm63xx/patches-5.4/611-board_bcm6358-bt-home-hub-2-a.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1327,6 +1327,31 @@ static struct board_info __initdata boar
+@@ -1579,6 +1579,31 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_HW520 = {
  	.name = "HW6358GW_B",
  	.expected_cpu_id = 0x6358,
-@@ -2066,6 +2091,7 @@ static const struct board_info __initcon
+@@ -1832,6 +1857,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
@@ -40,11 +40,11 @@
  	&board_HW520,
  	&board_HW553,
  	&board_HW556_A,
-@@ -2173,6 +2199,7 @@ static struct of_device_id const bcm963x
+@@ -1927,6 +1953,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
  	{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
 +	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
- 	{ .compatible = "sagem,fast-2504n", .data = &board_fast2504n, },
+ #endif /* CONFIG_BCM63XX_CPU_6362 */

target/linux/bcm63xx/patches-5.4/631-board_bcm6361-sfr-neufbox-6.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -942,6 +942,31 @@ static struct board_info __initdata boar
+@@ -1787,6 +1787,31 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -30,23 +30,23 @@
 +#endif /* CONFIG_BCM63XX_CPU_6362 */
 +
  /*
-  * known 6368 boards
+  * all boards
   */
-@@ -1079,6 +1104,9 @@ static const struct board_info __initcon
+@@ -1866,6 +1891,9 @@ static const struct board_info __initcon
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
 +#ifdef CONFIG_BCM63XX_CPU_6362
 +	&board_nb6,
 +#endif /* CONFIG_BCM63XX_CPU_6362 */
- #ifdef CONFIG_BCM63XX_CPU_6368
- 	&board_96368mvwg,
- 	&board_96368mvngr,
-@@ -1150,6 +1178,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
+ };
+ 
+ static struct of_device_id const bcm963xx_boards_dt[] = {
+@@ -1956,6 +1984,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
 +	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
- 	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
+ #endif /* CONFIG_BCM63XX_CPU_6368 */

target/linux/bcm63xx/patches-5.4/632-board_bcm6362-sagem-fast-2504n.patch

@@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1288,6 +1288,37 @@ static struct board_info __initdata boar
+@@ -1810,6 +1810,37 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -44,16 +44,16 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -1438,6 +1469,7 @@ static const struct board_info __initcon
+@@ -1893,6 +1924,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
 +	&board_fast2504n,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
- #ifdef CONFIG_BCM63XX_CPU_6368
- 	&board_96368mvwg,
-@@ -1520,6 +1552,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
+ };
+ 
+@@ -1984,6 +2016,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
 +	{ .compatible = "sagem,fast-2504n", .data = &board_fast2504n, },

target/linux/bcm63xx/patches-5.4/633-board-bcm6362-netgear-dgnd3700-v2.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1770,6 +1770,30 @@ static struct board_info __initdata boar
+@@ -1811,6 +1811,30 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -31,15 +31,15 @@
  static struct board_info __initdata board_fast2504n = {
  	.name = "F@ST2504n",
  	.expected_cpu_id = 0x6362,
-@@ -2736,6 +2760,7 @@ static const struct board_info __initcon
+@@ -1924,6 +1948,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
 +	&board_dgnd3700v2,
  	&board_fast2504n,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
- #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2850,6 +2875,7 @@ static struct of_device_id const bcm963x
+ };
+@@ -2016,6 +2041,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362

target/linux/bcm63xx/patches-5.4/634-board-bcm6362-huawei-hg253s-v2.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1824,6 +1824,37 @@ static struct board_info __initdata boar
+@@ -1865,6 +1865,37 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -38,15 +38,15 @@
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -2787,6 +2818,7 @@ static const struct board_info __initcon
+@@ -1950,6 +1981,7 @@ static const struct board_info __initcon
  	&board_nb6,
  	&board_dgnd3700v2,
  	&board_fast2504n,
 +	&board_hg253s_v2,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
- #ifdef CONFIG_BCM63XX_CPU_6368
- 	&board_AV4202N,
-@@ -2901,6 +2933,7 @@ static struct of_device_id const bcm963x
+ };
+ 
+@@ -2041,6 +2073,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362

target/linux/bcm63xx/patches-5.4/651-bcm63xx-add-support-for-96368MVWG-board.patch

@@ -10,8 +10,8 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -774,6 +774,52 @@ static struct board_info __initdata boar
- #endif /* CONFIG_BCM63XX_CPU_6358 */
+@@ -1899,6 +1899,52 @@ static struct board_info __initdata boar
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
 + * known 6368 boards
@@ -63,18 +63,18 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -824,6 +870,9 @@ static const struct board_info __initcon
- 	&board_HW553,
- 	&board_spw303v,
- #endif /* CONFIG_BCM63XX_CPU_6358 */
+@@ -1983,6 +2029,9 @@ static const struct board_info __initcon
+ 	&board_fast2504n,
+ 	&board_hg253s_v2,
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
 +#ifdef CONFIG_BCM63XX_CPU_6368
 +	&board_96368mvwg,
 +#endif /* CONFIG_BCM63XX_CPU_6368 */
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -888,6 +937,7 @@ static struct of_device_id const bcm963x
- #ifdef CONFIG_BCM63XX_CPU_6362
+@@ -2079,6 +2128,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

target/linux/bcm63xx/patches-5.4/652-bcm63xx-add-support-for-96368MVNgr-board.patch

@@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -817,6 +817,41 @@ static struct board_info __initdata boar
+@@ -1942,6 +1942,41 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -51,16 +51,16 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -872,6 +907,7 @@ static const struct board_info __initcon
- #endif /* CONFIG_BCM63XX_CPU_6358 */
+@@ -2031,6 +2066,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
 +	&board_96368mvngr,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  };
  
-@@ -937,6 +973,7 @@ static struct of_device_id const bcm963x
- #ifdef CONFIG_BCM63XX_CPU_6362
+@@ -2128,6 +2164,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },

target/linux/bcm63xx/patches-5.4/653-board_bcm6369-comtrend-wap-5813n.patch

@@ -9,7 +9,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1504,6 +1506,47 @@ static struct board_info __initdata boar
+@@ -1977,6 +1979,47 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -57,19 +57,19 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1724,6 +1767,7 @@ static const struct board_info __initcon
+@@ -2067,6 +2110,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
 +	&board_WAP5813n,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
- #ifdef CONFIG_BCM63XX_CPU_63268
- 	&board_963268bu_p300,
-@@ -1816,6 +1860,7 @@ static struct of_device_id const bcm963x
+ };
+ 
+@@ -2166,6 +2210,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
 +	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
- 	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
+ #endif /* CONFIG_BCM63XX_CPU_63268 */

target/linux/bcm63xx/patches-5.4/654-board_bcm6368-comtrend-vr-3025u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1507,6 +1507,59 @@ static struct board_info __initdata boar
+@@ -1980,6 +1980,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -60,15 +60,15 @@
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1767,6 +1820,7 @@ static const struct board_info __initcon
+@@ -2110,6 +2163,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
 +	&board_VR3025u,
  	&board_WAP5813n,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
- #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1860,6 +1914,7 @@ static struct of_device_id const bcm963x
+ };
+@@ -2210,6 +2264,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

target/linux/bcm63xx/patches-5.4/655-board_bcm6368-comtrend-vr-3025un.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1560,6 +1560,59 @@ static struct board_info __initdata boar
+@@ -2033,6 +2033,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -60,15 +60,15 @@
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1821,6 +1874,7 @@ static const struct board_info __initcon
+@@ -2164,6 +2217,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_VR3025u,
 +	&board_VR3025un,
  	&board_WAP5813n,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
- #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1915,6 +1969,7 @@ static struct of_device_id const bcm963x
+ };
+@@ -2265,6 +2319,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },

target/linux/bcm63xx/patches-5.4/656-board_bcm6368-zyxel-p870hw-51a-v2.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1516,6 +1516,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1989,6 +1989,48 @@ static struct sprom_fixup __initdata vr3
  	{ .offset = 115, .value = 0xfad9 },
  };
  
@@ -49,7 +49,7 @@
  static struct board_info __initdata board_VR3025u = {
  	.name = "96368M-1541N",
  	.expected_cpu_id = 0x6368,
-@@ -1873,6 +1915,7 @@ static const struct board_info __initcon
+@@ -2216,6 +2258,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -57,11 +57,11 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_WAP5813n,
-@@ -1971,6 +2014,7 @@ static struct of_device_id const bcm963x
+@@ -2321,6 +2364,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
 +	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
- 	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
+ #endif /* CONFIG_BCM63XX_CPU_63268 */

target/linux/bcm63xx/patches-5.4/657-board_bcm6368-netgear-dgnd3700-v1.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1646,6 +1646,30 @@ static struct board_info __initdata boar
+@@ -1980,6 +1980,30 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -31,7 +31,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2057,6 +2081,7 @@ static const struct board_info __initcon
+@@ -2258,6 +2282,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -39,7 +39,7 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2159,6 +2184,7 @@ static struct of_device_id const bcm963x
+@@ -2364,6 +2389,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

target/linux/bcm63xx/patches-5.4/658-board_bcm6368-huawei-echolife-hg655b.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1695,6 +1695,52 @@ static struct board_info __initdata boar
+@@ -2004,6 +2004,52 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2108,6 +2154,7 @@ static const struct board_info __initcon
+@@ -2283,6 +2329,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -61,7 +61,7 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2211,6 +2258,7 @@ static struct of_device_id const bcm963x
+@@ -2389,6 +2436,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

target/linux/bcm63xx/patches-5.4/659-board_bcm6368-comtrend-vr-3026e.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1932,6 +1932,59 @@ static struct board_info __initdata boar
+@@ -2198,6 +2198,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -60,15 +60,15 @@
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2202,6 +2255,7 @@ static const struct board_info __initcon
+@@ -2333,6 +2386,7 @@ static const struct board_info __initcon
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
 +	&board_VR3026e,
  	&board_WAP5813n,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
- #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2302,6 +2356,7 @@ static struct of_device_id const bcm963x
+ };
+@@ -2435,6 +2489,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },

target/linux/bcm63xx/patches-5.4/660-board_bcm6368-huawei-echolife-hg622.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1828,6 +1828,52 @@ static struct board_info __initdata boar
+@@ -2050,6 +2050,52 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2296,6 +2342,7 @@ static const struct board_info __initcon
+@@ -2382,6 +2428,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -61,7 +61,7 @@
  	&board_HG655b,
  	&board_P870HW51A_V2,
  	&board_VR3025u,
-@@ -2404,6 +2451,7 @@ static struct of_device_id const bcm963x
+@@ -2491,6 +2538,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

target/linux/bcm63xx/patches-5.4/661-board_bcm6369-netgear-evg2000.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1782,6 +1782,43 @@ static struct board_info __initdata boar
+@@ -2004,6 +2004,43 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -44,7 +44,7 @@
  static struct board_info __initdata board_HG655b = {
  	.name = "HW65x",
  	.expected_cpu_id = 0x6368,
-@@ -2342,6 +2379,7 @@ static const struct board_info __initcon
+@@ -2428,6 +2465,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -52,7 +52,7 @@
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
-@@ -2454,6 +2492,7 @@ static struct of_device_id const bcm963x
+@@ -2541,6 +2579,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "huawei,echolife-hg622", .data = &board_HG622, },
  	{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
  	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },

target/linux/bcm63xx/patches-5.4/662-board_bcm6368-adb-av4202n.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1682,6 +1682,49 @@ static struct board_info __initdata boar
+@@ -1904,6 +1904,49 @@ static struct board_info __initdata boar
   * known 6368 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -50,15 +50,15 @@
  static struct board_info __initdata board_96368mvwg = {
  	.name = "96368MVWG",
  	.expected_cpu_id = 0x6368,
-@@ -2376,6 +2419,7 @@ static const struct board_info __initcon
- 	&board_fast2504n,
+@@ -2462,6 +2505,7 @@ static const struct board_info __initcon
+ 	&board_hg253s_v2,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	&board_AV4202N,
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
-@@ -2483,6 +2527,7 @@ static struct of_device_id const bcm963x
+@@ -2570,6 +2614,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368

target/linux/bcm63xx/patches-5.4/663-board_bcm6368-observa-vh4032n.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2155,6 +2155,106 @@ static struct board_info __initdata boar
+@@ -2377,6 +2377,106 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -107,7 +107,7 @@
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2427,6 +2527,7 @@ static const struct board_info __initcon
+@@ -2513,6 +2613,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -115,7 +115,7 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_VR3026e,
-@@ -2538,6 +2639,7 @@ static struct of_device_id const bcm963x
+@@ -2625,6 +2726,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
  	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
  	{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },

target/linux/bcm63xx/patches-5.4/664-board_bcm6368-actiontec-r1000h.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2005,6 +2005,29 @@ static struct board_info __initdata boar
+@@ -2227,6 +2227,29 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -30,7 +30,7 @@
  static struct board_info __initdata board_VR3025u = {
  	.name = "96368M-1541N",
  	.expected_cpu_id = 0x6368,
-@@ -2527,6 +2550,7 @@ static const struct board_info __initcon
+@@ -2613,6 +2636,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -38,7 +38,7 @@
  	&board_VH4032N,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2628,6 +2652,7 @@ static struct of_device_id const bcm963x
+@@ -2715,6 +2739,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368

target/linux/bcm63xx/patches-5.4/681-board_bcm63269-brcm-bcm963269bhr.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1492,6 +1492,46 @@ static struct board_info __initdata boar
+@@ -2543,6 +2543,46 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -47,9 +47,9 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1568,6 +1608,9 @@ static const struct board_info __initcon
- 	&board_96368mvwg,
- 	&board_96368mvngr,
+@@ -2643,6 +2683,9 @@ static const struct board_info __initcon
+ 	&board_VR3026e,
+ 	&board_WAP5813n,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
 +#ifdef CONFIG_BCM63XX_CPU_63268
 +	&board_963269bhr,
@@ -57,8 +57,8 @@
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1655,6 +1698,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
+@@ -2755,6 +2798,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },

target/linux/bcm63xx/patches-5.4/682-board_bcm63268-inteno-vg50.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1544,6 +1544,48 @@ static struct board_info __initdata boar
+@@ -2580,6 +2580,48 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -49,7 +49,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -1626,6 +1668,7 @@ static const struct board_info __initcon
+@@ -2685,6 +2727,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963269bhr,
@@ -57,7 +57,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -1716,6 +1759,7 @@ static struct of_device_id const bcm963x
+@@ -2799,6 +2842,7 @@ static struct of_device_id const bcm963x
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },

target/linux/bcm63xx/patches-5.4/683-board_bcm63268-brcm-bcm963268bu-p300.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1510,6 +1510,65 @@ static struct board_info __initdata boar
+@@ -2546,6 +2546,65 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -66,16 +66,16 @@
  static struct board_info __initdata board_963269bhr = {
  	.name = "963269BHR",
  	.expected_cpu_id = 0x63268,
-@@ -1667,6 +1726,7 @@ static const struct board_info __initcon
- 	&board_96368mvngr,
+@@ -2726,6 +2785,7 @@ static const struct board_info __initcon
+ 	&board_WAP5813n,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +	&board_963268bu_p300,
  	&board_963269bhr,
  	&board_vw6339gu,
  #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -1758,6 +1818,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
+@@ -2841,6 +2901,7 @@ static struct of_device_id const bcm963x
+ 	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },

target/linux/bcm63xx/patches-5.4/684-board_bcm63168-sky-sr102.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2583,6 +2583,42 @@ static struct board_info __initdata boar
+@@ -2681,6 +2681,42 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -43,7 +43,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2687,6 +2723,7 @@ static const struct board_info __initcon
+@@ -2788,6 +2824,7 @@ static const struct board_info __initcon
  	&board_963268bu_p300,
  	&board_963269bhr,
  	&board_vw6339gu,
@@ -51,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -2800,6 +2837,7 @@ static struct of_device_id const bcm963x
+@@ -2904,6 +2941,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
  	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },

target/linux/bcm63xx/patches-5.4/685-board-bcm63168-comtrend-vr-3032u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2542,6 +2542,41 @@ static struct board_info __initdata boar
+@@ -2640,6 +2640,41 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -42,7 +42,7 @@
  static struct board_info __initdata board_vw6339gu = {
  	.name = "VW6339GU",
  	.expected_cpu_id = 0x63268,
-@@ -2722,6 +2757,7 @@ static const struct board_info __initcon
+@@ -2823,6 +2858,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
  	&board_963269bhr,
@@ -50,7 +50,7 @@
  	&board_vw6339gu,
  	&board_BSKYB_63168,
  #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -2836,6 +2872,7 @@ static struct of_device_id const bcm963x
+@@ -2940,6 +2976,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },

target/linux/bcm63xx/patches-5.4/686-board-bcm63169-comtrend-vg-8050.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2566,6 +2566,31 @@ static struct board_info __initdata boar
+@@ -2640,6 +2640,31 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_VR3032u = {
  	.name = "963168M-1841N1",
  	.expected_cpu_id = 0x63268,
-@@ -2782,6 +2807,7 @@ static const struct board_info __initcon
+@@ -2858,6 +2883,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
  	&board_963269bhr,
@@ -40,7 +40,7 @@
  	&board_VR3032u,
  	&board_vw6339gu,
  	&board_BSKYB_63168,
-@@ -2898,6 +2924,7 @@ static struct of_device_id const bcm963x
+@@ -2976,6 +3002,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },