OpenWrt v18.06.8: adjust config defaults

Signed-off-by: Jo-Philipp Wich <jo@mein.io>

feeds.conf.default

@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git^925068d4f8366240d2aeb2d69b3df12382320ec3
+src-git packages https://git.openwrt.org/feed/packages.git^c05ea69d6d4f503c9bf69fd3d5e551e21c434084
 src-git luci https://git.openwrt.org/project/luci.git^41e2258d6dc1ebe8d3874ae6d6b13db49cff2c5c
 src-git routing https://git.openwrt.org/feed/routing.git^0e63ef9276bf41c0d4176127f9f047343b8ffe32
 src-git telephony https://git.openwrt.org/feed/telephony.git^8ecbdabc7c5cadbe571eb947f5cd333a5a785010

include/kernel-version.mk

@@ -2,11 +2,11 @@
 
 LINUX_RELEASE?=1
 
-LINUX_VERSION-4.9 = .211
-LINUX_VERSION-4.14 = .167
+LINUX_VERSION-4.9 = .214
+LINUX_VERSION-4.14 = .171
 
-LINUX_KERNEL_HASH-4.9.211 = 2597608d5d974cfdc015eaf6a4197b36f19d722b8a309b57e741fb02e311b1be
-LINUX_KERNEL_HASH-4.14.167 = 2bb78fc7a902faf4f5dad47fdbc2f4bf3df3cf9b41f408e7260f36656659fe43
+LINUX_KERNEL_HASH-4.9.214 = b47f093dac7034c7c4722e80042c05e4ef53c14a4f28aa992117a127d2b1e483
+LINUX_KERNEL_HASH-4.14.171 = 4fe02489e4b4a187eccf0ef87df6100534c9d485e76d876b1fa247c7635332a0
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

include/version.mk

@@ -26,13 +26,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06.7)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),18.06.8)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7976-ca47026b7d)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r7989-82fbd85747)
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06.7)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),http://downloads.openwrt.org/releases/18.06.8)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)

package/base-files/image-config.in

@@ -183,7 +183,7 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "http://downloads.openwrt.org/releases/18.06.7"
+		default "http://downloads.openwrt.org/releases/18.06.8"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:

package/libs/libubox/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libubox
-PKG_RELEASE=3
+PKG_RELEASE=4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git

package/libs/libubox/patches/0017-blobmsg-fix-wrong-payload-len-passed-from-blobmsg_ch.patch

@@ -0,0 +1,33 @@
+From 75e300aeec25e032a9778bea34c713969960d1f0 Mon Sep 17 00:00:00 2001
+From: Chris Nisbet <nischris@gmail.com>
+Date: Wed, 12 Feb 2020 21:00:31 +1300
+Subject: [PATCH] blobmsg: fix wrong payload len passed from
+ blobmsg_check_array
+
+Fix incorrect use of blobmsg_len() on passed blobmsg to
+blobmsg_check_array_len() introduced in commit 379cd33d1992
+("fix wrong payload len passed from blobmsg_check_array") by using correct
+blob_len().
+
+By using blobmsg_len() a value too small was passed to blobmsg_check_array()
+which could lead to this function returning an error when there is none.
+
+Fixes: 379cd33d1992 ("fix wrong payload len passed from blobmsg_check_array")
+Signed-off-by: Chris Nisbet <nischris@gmail.com>
+[add fixes tag, rewrap commit message]
+Signed-off-by: Jo-Philipp Wich <jo@mein.io>
+---
+ blobmsg.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/blobmsg.c
++++ b/blobmsg.c
+@@ -120,7 +120,7 @@ bool blobmsg_check_attr_len(const struct
+ 
+ int blobmsg_check_array(const struct blob_attr *attr, int type)
+ {
+-	return blobmsg_check_array_len(attr, type, blobmsg_len(attr));
++	return blobmsg_check_array_len(attr, type, blob_len(attr));
+ }
+ 
+ int blobmsg_check_array_len(const struct blob_attr *attr, int type, size_t len)

package/network/services/hostapd/Makefile

@@ -88,9 +88,6 @@ DRIVER_MAKEOPTS= \
 	CONFIG_IEEE80211AC=$(HOSTAPD_IEEE80211AC) \
 	CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \
 
-space :=
-space +=
-
 ifeq ($(LOCAL_VARIANT),full)
   DRIVER_MAKEOPTS += CONFIG_IEEE80211W=$(CONFIG_DRIVER_11W_SUPPORT)
 endif

package/network/services/ppp/Makefile

@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ppp
 PKG_VERSION:=2.4.7
-PKG_RELEASE:=12
+PKG_RELEASE:=13
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://download.samba.org/pub/ppp/

package/network/services/ppp/patches/700-radius-Prevent-buffer-overflow-in-rc_mksid.patch

@@ -0,0 +1,30 @@
+From 858976b1fc3107f1261aae337831959b511b83c2 Mon Sep 17 00:00:00 2001
+From: Paul Mackerras <paulus@ozlabs.org>
+Date: Sat, 4 Jan 2020 12:01:32 +1100
+Subject: [PATCH] radius: Prevent buffer overflow in rc_mksid()
+
+On some systems getpid() can return a value greater than 65535.
+Increase the size of buf[] to allow for this, and use slprintf()
+to make sure we never overflow it.
+
+Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+---
+ pppd/plugins/radius/util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pppd/plugins/radius/util.c b/pppd/plugins/radius/util.c
+index 6f976a712951..740131e8377c 100644
+--- a/pppd/plugins/radius/util.c
++++ b/pppd/plugins/radius/util.c
+@@ -73,9 +73,9 @@ void rc_mdelay(int msecs)
+ char *
+ rc_mksid (void)
+ {
+-  static char buf[15];
++  static char buf[32];
+   static unsigned short int cnt = 0;
+-  sprintf (buf, "%08lX%04X%02hX",
++  slprintf(buf, sizeof(buf), "%08lX%04X%02hX",
+ 	   (unsigned long int) time (NULL),
+ 	   (unsigned int) getpid (),
+ 	   cnt & 0xFF);

package/network/services/ppp/patches/701-pppd-Fix-bounds-check-in-EAP-code.patch

@@ -0,0 +1,37 @@
+From 8d7970b8f3db727fe798b65f3377fe6787575426 Mon Sep 17 00:00:00 2001
+From: Paul Mackerras <paulus@ozlabs.org>
+Date: Mon, 3 Feb 2020 15:53:28 +1100
+Subject: [PATCH] pppd: Fix bounds check in EAP code
+
+Given that we have just checked vallen < len, it can never be the case
+that vallen >= len + sizeof(rhostname).  This fixes the check so we
+actually avoid overflowing the rhostname array.
+
+Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
+Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+---
+ pppd/eap.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pppd/eap.c b/pppd/eap.c
+index 94407f56a336..1b93db01aebd 100644
+--- a/pppd/eap.c
++++ b/pppd/eap.c
+@@ -1420,7 +1420,7 @@ int len;
+ 		}
+ 
+ 		/* Not so likely to happen. */
+-		if (vallen >= len + sizeof (rhostname)) {
++		if (len - vallen >= sizeof (rhostname)) {
+ 			dbglog("EAP: trimming really long peer name down");
+ 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
+ 			rhostname[sizeof (rhostname) - 1] = '\0';
+@@ -1846,7 +1846,7 @@ int len;
+ 		}
+ 
+ 		/* Not so likely to happen. */
+-		if (vallen >= len + sizeof (rhostname)) {
++		if (len - vallen >= sizeof (rhostname)) {
+ 			dbglog("EAP: trimming really long peer name down");
+ 			BCOPY(inp + vallen, rhostname, sizeof (rhostname) - 1);
+ 			rhostname[sizeof (rhostname) - 1] = '\0';

package/network/services/ppp/patches/702-pppd-Ignore-received-EAP-messages-when-not-doing-EAP.patch

@@ -0,0 +1,61 @@
+From 8d45443bb5c9372b4c6a362ba2f443d41c5636af Mon Sep 17 00:00:00 2001
+From: Paul Mackerras <paulus@ozlabs.org>
+Date: Mon, 3 Feb 2020 16:31:42 +1100
+Subject: [PATCH] pppd: Ignore received EAP messages when not doing EAP
+
+This adds some basic checks to the subroutines of eap_input to check
+that we have requested or agreed to doing EAP authentication before
+doing any processing on the received packet.  The motivation is to
+make it harder for a malicious peer to disrupt the operation of pppd
+by sending unsolicited EAP packets.  Note that eap_success() already
+has a check that the EAP client state is reasonable, and does nothing
+(apart from possibly printing a debug message) if not.
+
+Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
+---
+ pppd/eap.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+diff --git a/pppd/eap.c b/pppd/eap.c
+index 1b93db01aebd..082e95343120 100644
+--- a/pppd/eap.c
++++ b/pppd/eap.c
+@@ -1328,6 +1328,12 @@ int len;
+ 	int fd;
+ #endif /* USE_SRP */
+ 
++	/*
++	 * Ignore requests if we're not open
++	 */
++	if (esp->es_client.ea_state <= eapClosed)
++		return;
++
+ 	/*
+ 	 * Note: we update es_client.ea_id *only if* a Response
+ 	 * message is being generated.  Otherwise, we leave it the
+@@ -1736,6 +1742,12 @@ int len;
+ 	u_char dig[SHA_DIGESTSIZE];
+ #endif /* USE_SRP */
+ 
++	/*
++	 * Ignore responses if we're not open
++	 */
++	if (esp->es_server.ea_state <= eapClosed)
++		return;
++
+ 	if (esp->es_server.ea_id != id) {
+ 		dbglog("EAP: discarding Response %d; expected ID %d", id,
+ 		    esp->es_server.ea_id);
+@@ -2047,6 +2059,12 @@ u_char *inp;
+ int id;
+ int len;
+ {
++	/*
++	 * Ignore failure messages if we're not open
++	 */
++	if (esp->es_client.ea_state <= eapClosed)
++		return;
++
+ 	if (!eap_client_active(esp)) {
+ 		dbglog("EAP unexpected failure message in state %s (%d)",
+ 		    eap_state_name(esp->es_client.ea_state),

package/network/services/uhttpd/Makefile

@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
-PKG_SOURCE_DATE:=2019-12-22
-PKG_SOURCE_VERSION:=5f9ae5738372aaa3a6be2f0a278933563d3f191a
-PKG_MIRROR_HASH:=16977c2d7e68f6db3241f874df625af9bd3bafa06fe4499ecb3561c825321e5d
+PKG_SOURCE_DATE:=2020-02-12
+PKG_SOURCE_VERSION:=2ee323c01079248baa9465969df9e25b5fb68cdf
+PKG_MIRROR_HASH:=ebec09286cf5f977cac893931a5a4f27ba891db88d5e44a9b0de9446ae431527
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=ISC
 

target/linux/apm821xx/patches-4.14/023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch

@@ -1,39 +0,0 @@
-From 6e88098ca43a3d80ae86908f7badba683c8a0d84 Mon Sep 17 00:00:00 2001
-From: Corentin Labbe <clabbe@baylibre.com>
-Date: Wed, 23 Jan 2019 11:24:18 +0000
-Subject: [PATCH 07/15] crypto: crypto4xx - Fix wrong
- ppc4xx_trng_probe()/ppc4xx_trng_remove() arguments
-
-When building without CONFIG_HW_RANDOM_PPC4XX, I hit the following build failure:
-drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_probe':
-drivers/crypto/amcc/crypto4xx_core.c:1407:20: error: passing argument 1 of 'ppc4xx_trng_probe' from incompatible pointer type [-Werror=incompatible-pointer-types]
-In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:
-drivers/crypto/amcc/crypto4xx_trng.h:28:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'
-drivers/crypto/amcc/crypto4xx_core.c: In function 'crypto4xx_remove':
-drivers/crypto/amcc/crypto4xx_core.c:1434:21: error: passing argument 1 of 'ppc4xx_trng_remove' from incompatible pointer type [-Werror=incompatible-pointer-types]
-In file included from drivers/crypto/amcc/crypto4xx_core.c:50:0:
-drivers/crypto/amcc/crypto4xx_trng.h:30:20: note: expected 'struct crypto4xx_device *' but argument is of type 'struct crypto4xx_core_device *'
-
-This patch fix the needed argument of ppc4xx_trng_probe()/ppc4xx_trng_remove() in that case.
-
-Fixes: 5343e674f32f ("crypto4xx: integrate ppc4xx-rng into crypto4xx")
-Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
----
- drivers/crypto/amcc/crypto4xx_trng.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/crypto/amcc/crypto4xx_trng.h
-+++ b/drivers/crypto/amcc/crypto4xx_trng.h
-@@ -26,9 +26,9 @@ void ppc4xx_trng_probe(struct crypto4xx_
- void ppc4xx_trng_remove(struct crypto4xx_core_device *core_dev);
- #else
- static inline void ppc4xx_trng_probe(
--	struct crypto4xx_device *dev __maybe_unused) { }
-+	struct crypto4xx_core_device *dev __maybe_unused) { }
- static inline void ppc4xx_trng_remove(
--	struct crypto4xx_device *dev __maybe_unused) { }
-+	struct crypto4xx_core_device *dev __maybe_unused) { }
- #endif
- 
- #endif

target/linux/ar71xx/patches-4.9/450-gpio-nxp-74hc153-gpio-chip-driver.patch

@@ -1,6 +1,6 @@
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1214,4 +1214,12 @@ config GPIO_VIPERBOARD
+@@ -1215,4 +1215,12 @@ config GPIO_VIPERBOARD
  
  endmenu
  

target/linux/ar71xx/patches-4.9/451-gpio-74x164-improve-platform-device-support.patch

@@ -109,7 +109,7 @@
 +#endif
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1155,7 +1155,6 @@ menu "SPI GPIO expanders"
+@@ -1156,7 +1156,6 @@ menu "SPI GPIO expanders"
  
  config GPIO_74X164
  	tristate "74x164 serial-in/parallel-out 8-bits shift register"

target/linux/ar71xx/patches-4.9/452-gpio-add-gpio-latch-driver.patch

@@ -1,6 +1,6 @@
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -1221,4 +1221,9 @@ config GPIO_NXP_74HC153
+@@ -1222,4 +1222,9 @@ config GPIO_NXP_74HC153
  	  Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
  	  provides a GPIO interface supporting input mode only.
  

target/linux/ar71xx/patches-4.9/910-unaligned_access_hacks.patch

@@ -869,7 +869,7 @@
   * No flags defined yet.
 --- a/net/core/utils.c
 +++ b/net/core/utils.c
-@@ -321,8 +321,14 @@ void inet_proto_csum_replace16(__sum16 *
+@@ -338,8 +338,14 @@ void inet_proto_csum_replace16(__sum16 *
  			       bool pseudohdr)
  {
  	__be32 diff[] = {

target/linux/ath25/patches-4.14/130-watchdog.patch

@@ -212,7 +212,7 @@
 +MODULE_ALIAS("platform:" DRIVER_NAME);
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1646,6 +1646,13 @@ config PIC32_DMT
+@@ -1647,6 +1647,13 @@ config PIC32_DMT
  	  To compile this driver as a loadable module, choose M here.
  	  The module will be called pic32-dmt.
  

target/linux/bcm53xx/patches-4.14/400-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch

@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
 
 --- a/drivers/mtd/spi-nor/spi-nor.c
 +++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -1220,6 +1220,18 @@ static const struct flash_info *spi_nor_
+@@ -1225,6 +1225,18 @@ static const struct flash_info *spi_nor_
  	}
  	dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %02x, %02x\n",
  		id[0], id[1], id[2]);

target/linux/brcm2708/patches-4.9/950-0090-OF-DT-Overlay-configfs-interface.patch

@@ -88,8 +88,8 @@ Signed-off-by: Slawomir Stepien <sst@poczta.fm>
 +make sense for developers (since it avoids problems with namespaces).
 --- a/drivers/of/Kconfig
 +++ b/drivers/of/Kconfig
-@@ -112,4 +112,11 @@ config OF_OVERLAY
- config OF_NUMA
+@@ -116,4 +116,11 @@ config OF_DMA_DEFAULT_COHERENT
+ 	# arches should select this if DMA is coherent by default for OF devices
  	bool
  
 +config OF_CONFIGFS

target/linux/brcm47xx/patches-4.14/209-b44-register-adm-switch.patch

@@ -19,7 +19,7 @@ Subject: [PATCH 210/210] b44: register adm switch
  
  #include <linux/uaccess.h>
  #include <asm/io.h>
-@@ -2248,6 +2250,69 @@ static void b44_adjust_link(struct net_d
+@@ -2251,6 +2253,69 @@ static void b44_adjust_link(struct net_d
  	}
  }
  
@@ -89,7 +89,7 @@ Subject: [PATCH 210/210] b44: register adm switch
  static int b44_register_phy_one(struct b44 *bp)
  {
  	struct mii_bus *mii_bus;
-@@ -2283,6 +2348,9 @@ static int b44_register_phy_one(struct b
+@@ -2286,6 +2351,9 @@ static int b44_register_phy_one(struct b
  	if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) &&
  	    (sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {
  
@@ -99,7 +99,7 @@ Subject: [PATCH 210/210] b44: register adm switch
  		dev_info(sdev->dev,
  			 "could not find PHY at %i, use fixed one\n",
  			 bp->phy_addr);
-@@ -2477,6 +2545,7 @@ static void b44_remove_one(struct ssb_de
+@@ -2480,6 +2548,7 @@ static void b44_remove_one(struct ssb_de
  	unregister_netdev(dev);
  	if (bp->flags & B44_FLAG_EXTERNAL_PHY)
  		b44_unregister_phy_one(bp);

target/linux/brcm47xx/patches-4.14/210-b44_phy_fix.patch

@@ -43,7 +43,7 @@
  
  	if (bp->flags & B44_FLAG_EXTERNAL_PHY)
  		return 0;
-@@ -2178,6 +2203,8 @@ static int b44_get_invariants(struct b44
+@@ -2181,6 +2206,8 @@ static int b44_get_invariants(struct b44
  	 * valid PHY address. */
  	bp->phy_addr &= 0x1F;
  

target/linux/brcm47xx/patches-4.14/831-old_gpio_wdt.patch

@@ -4,7 +4,7 @@ Signed-off-by: Mathias Adam <m.adam--openwrt@adamis.de>
 
 --- a/drivers/watchdog/Kconfig
 +++ b/drivers/watchdog/Kconfig
-@@ -1472,6 +1472,15 @@ config WDT_MTX1
+@@ -1473,6 +1473,15 @@ config WDT_MTX1
  	  Hardware driver for the MTX-1 boards. This is a watchdog timer that
  	  will reboot the machine after a 100 seconds timer expired.
  

target/linux/brcm47xx/patches-4.9/209-b44-register-adm-switch.patch

@@ -19,7 +19,7 @@ Subject: [PATCH 210/210] b44: register adm switch
  
  #include <asm/uaccess.h>
  #include <asm/io.h>
-@@ -2250,6 +2252,69 @@ static void b44_adjust_link(struct net_d
+@@ -2253,6 +2255,69 @@ static void b44_adjust_link(struct net_d
  	}
  }
  
@@ -89,7 +89,7 @@ Subject: [PATCH 210/210] b44: register adm switch
  static int b44_register_phy_one(struct b44 *bp)
  {
  	struct mii_bus *mii_bus;
-@@ -2285,6 +2350,9 @@ static int b44_register_phy_one(struct b
+@@ -2288,6 +2353,9 @@ static int b44_register_phy_one(struct b
  	if (!mdiobus_is_registered_device(bp->mii_bus, bp->phy_addr) &&
  	    (sprom->boardflags_lo & (B44_BOARDFLAG_ROBO | B44_BOARDFLAG_ADM))) {
  
@@ -99,7 +99,7 @@ Subject: [PATCH 210/210] b44: register adm switch
  		dev_info(sdev->dev,
  			 "could not find PHY at %i, use fixed one\n",
  			 bp->phy_addr);
-@@ -2476,6 +2544,7 @@ static void b44_remove_one(struct ssb_de
+@@ -2479,6 +2547,7 @@ static void b44_remove_one(struct ssb_de
  	unregister_netdev(dev);
  	if (bp->flags & B44_FLAG_EXTERNAL_PHY)
  		b44_unregister_phy_one(bp);

target/linux/brcm47xx/patches-4.9/210-b44_phy_fix.patch

@@ -43,7 +43,7 @@
  
  	if (bp->flags & B44_FLAG_EXTERNAL_PHY)
  		return 0;
-@@ -2180,6 +2205,8 @@ static int b44_get_invariants(struct b44
+@@ -2183,6 +2208,8 @@ static int b44_get_invariants(struct b44
  	 * valid PHY address. */
  	bp->phy_addr &= 0x1F;
  

target/linux/brcm63xx/patches-4.14/102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch

@@ -23,10 +23,10 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 +++ b/arch/mips/bcm63xx/Makefile
 @@ -2,7 +2,7 @@
  obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- 		   dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
--		   dev-wdt.o dev-usb-usbd.o
-+		   dev-wdt.o dev-usb-usbd.o usb-common.o
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+ 		   dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \
+-		   dev-usb-usbd.o
++		   dev-usb-usbd.o usb-common.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  
  obj-y		+= boards/

target/linux/brcm63xx/patches-4.14/105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch

@@ -23,10 +23,10 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 +++ b/arch/mips/bcm63xx/Makefile
 @@ -2,7 +2,7 @@
  obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- 		   dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
--		   dev-wdt.o dev-usb-usbd.o usb-common.o
-+		   dev-wdt.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+ 		   dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \
+-		   dev-usb-usbd.o usb-common.o
++		   dev-usb-ohci.o dev-usb-usbd.o usb-common.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  
  obj-y		+= boards/

target/linux/brcm63xx/patches-4.14/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch

@@ -16,7 +16,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,6 +28,7 @@
+@@ -27,6 +27,7 @@
  #include <bcm63xx_dev_hsspi.h>
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
@@ -24,13 +24,13 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  #include <bcm63xx_dev_usb_usbd.h>
  #include <board_bcm963xx.h>
  
-@@ -898,6 +899,9 @@ int __init board_register_devices(void)
+@@ -881,6 +882,9 @@ int __init board_register_devices(void)
  	if (board.has_usbd)
  		bcm63xx_usbd_register(&board.usbd);
  
 +	if (board.has_ohci0)
 +		bcm63xx_ohci_register();
 +
- 	if (board.has_dsp)
- 		bcm63xx_dsp_register(&board.dsp);
- 
+ 	/* Generate MAC address for WLAN and register our SPROM,
+ 	 * do this after registering enet devices
+ 	 */

target/linux/brcm63xx/patches-4.14/108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch

@@ -21,13 +21,12 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 
 --- a/arch/mips/bcm63xx/Makefile
 +++ b/arch/mips/bcm63xx/Makefile
-@@ -2,7 +2,8 @@
+@@ -2,7 +2,7 @@
  obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- 		   dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
--		   dev-wdt.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o
-+		   dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
-+		   usb-common.o
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+ 		   dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \
+-		   dev-usb-ohci.o dev-usb-usbd.o usb-common.o
++		   dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  
  obj-y		+= boards/

target/linux/brcm63xx/patches-4.14/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch

@@ -16,7 +16,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -28,6 +28,7 @@
+@@ -27,6 +27,7 @@
  #include <bcm63xx_dev_hsspi.h>
  #include <bcm63xx_dev_pcmcia.h>
  #include <bcm63xx_dev_spi.h>
@@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  #include <bcm63xx_dev_usb_ohci.h>
  #include <bcm63xx_dev_usb_usbd.h>
  #include <board_bcm963xx.h>
-@@ -899,6 +900,9 @@ int __init board_register_devices(void)
+@@ -882,6 +883,9 @@ int __init board_register_devices(void)
  	if (board.has_usbd)
  		bcm63xx_usbd_register(&board.usbd);
  

target/linux/brcm63xx/patches-4.14/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch

@@ -24,7 +24,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  obj-$(CONFIG_BOARD_BCM963XX)		+= board_bcm963xx.o
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -12,34 +12,21 @@
+@@ -12,33 +12,21 @@
  #include <linux/init.h>
  #include <linux/kernel.h>
  #include <linux/string.h>
@@ -39,7 +39,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #include <bcm63xx_nvram.h>
 -#include <bcm63xx_dev_pci.h>
 -#include <bcm63xx_dev_enet.h>
--#include <bcm63xx_dev_dsp.h>
 -#include <bcm63xx_dev_flash.h>
 -#include <bcm63xx_dev_hsspi.h>
 -#include <bcm63xx_dev_pcmcia.h>
@@ -61,7 +60,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /*
   * known 3368 boards
   */
-@@ -712,52 +699,6 @@ static const struct board_info __initcon
+@@ -695,52 +683,6 @@ static const struct board_info __initcon
  };
  
  /*
@@ -114,7 +113,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   * early init callback, read nvram data from flash and checksum it
   */
  void __init board_prom_init(void)
-@@ -802,140 +743,15 @@ void __init board_prom_init(void)
+@@ -785,137 +727,15 @@ void __init board_prom_init(void)
  		if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
  			continue;
  		/* copy, board desc array is marked initdata */
@@ -144,7 +143,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 -		bcm63xx_pci_enabled = 1;
 -		if (BCMCPU_IS_6348())
 -			val |= GPIO_MODE_6348_G2_PCI;
--	}
+ 	}
 -#endif
 -
 -	if (board.has_pccard) {
@@ -225,9 +224,6 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 -	if (board.has_ohci0)
 -		bcm63xx_ohci_register();
 -
--	if (board.has_dsp)
--		bcm63xx_dsp_register(&board.dsp);
--
 -	/* Generate MAC address for WLAN and register our SPROM,
 -	 * do this after registering enet devices
 -	 */
@@ -238,7 +234,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 -		if (ssb_arch_register_fallback_sprom(
 -				&bcm63xx_get_fallback_sprom) < 0)
 -			pr_err("failed to register fallback SPROM\n");
- 	}
+-	}
 -#endif
 -
 -	bcm63xx_spi_register();

target/linux/brcm63xx/patches-4.14/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch

@@ -17,7 +17,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
-@@ -743,7 +743,8 @@ void __init board_prom_init(void)
+@@ -727,7 +727,8 @@ void __init board_prom_init(void)
  		if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
  			continue;
  		/* copy, board desc array is marked initdata */

target/linux/brcm63xx/patches-4.14/309-cfe_version_mod.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -723,10 +723,20 @@ void __init board_prom_init(void)
+@@ -707,10 +707,20 @@ void __init board_prom_init(void)
  
  	/* dump cfe version */
  	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;

target/linux/brcm63xx/patches-4.14/339-MIPS-BCM63XX-add-support-for-BCM63268.patch

@@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  source "arch/mips/bcm63xx/boards/Kconfig"
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -713,7 +713,7 @@ void __init board_prom_init(void)
+@@ -697,7 +697,7 @@ void __init board_prom_init(void)
  	/* read base address of boot chip select (0)
  	 * 6328/6362 do not have MPI but boot from a fixed address
  	 */

target/linux/brcm63xx/patches-4.14/341-MIPS-BCM63XX-add-support-for-BCM6318.patch

@@ -35,7 +35,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
  	select SYS_HAS_CPU_BMIPS4350
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -713,7 +713,7 @@ void __init board_prom_init(void)
+@@ -697,7 +697,7 @@ void __init board_prom_init(void)
  	/* read base address of boot chip select (0)
  	 * 6328/6362 do not have MPI but boot from a fixed address
  	 */

target/linux/brcm63xx/patches-4.14/350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch

@@ -1,13 +1,13 @@
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -42,6 +42,7 @@ struct board_info {
+@@ -40,6 +40,7 @@ struct board_info {
  
  	/* USB config */
  	struct bcm63xx_usbd_platform_data usbd;
 +	unsigned int num_usbh_ports:2;
  
- 	/* DSP config */
- 	struct bcm63xx_dsp_platform_data dsp;
+ 	/* GPIO LEDs */
+ 	struct gpio_led leds[5];
 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h
 @@ -1,6 +1,6 @@

target/linux/brcm63xx/patches-4.14/351-set-board-usbh-ports.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -592,6 +592,7 @@ static struct board_info __initdata boar
+@@ -576,6 +576,7 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_pccard = 1,
  	.has_ehci0 = 1,

target/linux/brcm63xx/patches-4.14/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch

@@ -36,7 +36,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +endmenu
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -702,7 +702,7 @@ static const struct board_info __initcon
+@@ -686,7 +686,7 @@ static const struct board_info __initcon
  /*
   * early init callback, read nvram data from flash and checksum it
   */

target/linux/brcm63xx/patches-4.14/356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch

@@ -20,12 +20,13 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/bcm63xx/Makefile
 +++ b/arch/mips/bcm63xx/Makefile
-@@ -3,7 +3,7 @@ obj-y		+= clk.o cpu.o cs.o gpio.o irq.o
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- 		   dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
- 		   dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
--		   usb-common.o
-+		   usb-common.o sprom.o
+@@ -2,7 +2,8 @@
+ obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+ 		   dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \
+-		   dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o
++		   dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \
++		   sprom.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  
  obj-y		+= boards/

target/linux/brcm63xx/patches-4.14/357-MIPS-BCM63XX-use-platform-data-for-the-sprom.patch

@@ -75,15 +75,15 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #endif
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -8,6 +8,7 @@
+@@ -7,6 +7,7 @@
+ #include <linux/leds.h>
  #include <bcm63xx_dev_enet.h>
  #include <bcm63xx_dev_usb_usbd.h>
- #include <bcm63xx_dev_dsp.h>
 +#include <bcm63xx_fallback_sprom.h>
  
  /*
   * flash mapping
-@@ -55,6 +56,9 @@ struct board_info {
+@@ -50,6 +51,9 @@ struct board_info {
  
  	/* External PHY reset GPIO flags from gpio.h */
  	unsigned long ephy_reset_gpio_flags;

target/linux/brcm63xx/patches-4.14/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch

@@ -42,7 +42,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -324,6 +327,7 @@ static struct board_info __initdata boar
+@@ -316,6 +319,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -378,6 +382,7 @@ static struct board_info __initdata boar
+@@ -370,6 +374,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -58,7 +58,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -436,6 +441,7 @@ static struct board_info __initdata boar
+@@ -420,6 +425,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -459,6 +465,7 @@ static struct board_info __initdata boar
+@@ -443,6 +449,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -74,7 +74,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -477,6 +484,7 @@ static struct board_info __initdata boar
+@@ -461,6 +468,7 @@ static struct board_info __initdata boar
  
  	.has_uart0			= 1,
  	.has_pci			= 1,
@@ -82,7 +82,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  	.has_ohci0			= 1,
  
  	.has_enet0			= 1,
-@@ -499,6 +507,7 @@ static struct board_info __initdata boar
+@@ -483,6 +491,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -90,7 +90,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -525,6 +534,7 @@ static struct board_info __initdata boar
+@@ -509,6 +518,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -98,7 +98,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -577,6 +587,7 @@ static struct board_info __initdata boar
+@@ -561,6 +571,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -106,7 +106,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -648,6 +659,7 @@ static struct board_info __initdata boar
+@@ -632,6 +643,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -130,8 +130,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  	bcm63xx_spi_register();
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -35,6 +35,7 @@ struct board_info {
- 	unsigned int	has_dsp:1;
+@@ -33,6 +33,7 @@ struct board_info {
+ 	unsigned int	has_usbd:1;
  	unsigned int	has_uart0:1;
  	unsigned int	has_uart1:1;
 +	unsigned int	use_fallback_sprom:1;

target/linux/brcm63xx/patches-4.14/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch

@@ -16,7 +16,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
-@@ -711,6 +711,10 @@ static const struct board_info __initcon
+@@ -695,6 +695,10 @@ static const struct board_info __initcon
  #endif
  };
  
@@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -722,6 +726,7 @@ void __init board_bcm963xx_init(void)
+@@ -706,6 +710,7 @@ void __init board_bcm963xx_init(void)
  	char *board_name = NULL;
  	u32 val;
  	struct bcm_hcs *hcs;
@@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	/* read base address of boot chip select (0)
  	 * 6328/6362 do not have MPI but boot from a fixed address
-@@ -761,6 +766,16 @@ void __init board_bcm963xx_init(void)
+@@ -745,6 +750,16 @@ void __init board_bcm963xx_init(void)
  	} else {
  		board_name = bcm63xx_nvram_get_name();
  	}

target/linux/brcm63xx/patches-4.14/369-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
-@@ -712,6 +712,48 @@ static const struct board_info __initcon
+@@ -696,6 +696,48 @@ static const struct board_info __initcon
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {

target/linux/brcm63xx/patches-4.14/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch

@@ -116,7 +116,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  #include <linux/leds.h>
  #include <bcm63xx_dev_enet.h>
  #include <bcm63xx_dev_usb_usbd.h>
-@@ -55,8 +56,8 @@ struct board_info {
+@@ -50,8 +51,8 @@ struct board_info {
  	/* External PHY reset GPIO */
  	unsigned int ephy_reset_gpio;
  

target/linux/brcm63xx/patches-4.14/390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch

@@ -35,15 +35,18 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  	bcm63xx_led_data.num_leds = ARRAY_SIZE(board.leds);
 --- a/arch/mips/bcm63xx/Makefile
 +++ b/arch/mips/bcm63xx/Makefile
-@@ -1,7 +1,7 @@
+@@ -1,9 +1,8 @@
  # SPDX-License-Identifier: GPL-2.0
  obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
--		   dev-pcmcia.o dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o \
-+		   dev-pcmcia.o dev-rng.o dev-uart.o \
- 		   dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
- 		   usb-common.o sprom.o
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+-		   dev-rng.o dev-spi.o dev-hsspi.o dev-uart.o dev-wdt.o \
+-		   dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o usb-common.o \
+-		   sprom.o
++		   dev-rng.o dev-uart.o dev-wdt.o dev-usb-ehci.o \
++		   dev-usb-ohci.o dev-usb-usbd.o usb-common.o sprom.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
+ 
+ obj-y		+= boards/
 --- a/arch/mips/bcm63xx/dev-hsspi.c
 +++ /dev/null
 @@ -1,48 +0,0 @@

target/linux/brcm63xx/patches-4.14/391-MIPS-BCM63XX-do-not-register-uart.patch

@@ -3,12 +3,12 @@
 @@ -1,7 +1,7 @@
  # SPDX-License-Identifier: GPL-2.0
  obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
--		   dev-pcmcia.o dev-rng.o dev-uart.o \
-+		   dev-pcmcia.o dev-rng.o \
- 		   dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
- 		   usb-common.o sprom.o
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+-		   dev-rng.o dev-uart.o dev-wdt.o dev-usb-ehci.o \
++		   dev-rng.o dev-wdt.o dev-usb-ehci.o \
+ 		   dev-usb-ohci.o dev-usb-usbd.o usb-common.o sprom.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
+ 
 --- a/arch/mips/bcm63xx/dev-uart.c
 +++ /dev/null
 @@ -1,76 +0,0 @@
@@ -98,17 +98,6 @@
 -int bcm63xx_uart_register(unsigned int id);
 -
 -#endif /* BCM63XX_DEV_UART_H_ */
---- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -34,8 +34,6 @@ struct board_info {
- 	unsigned int	has_ehci0:1;
- 	unsigned int	has_usbd:1;
- 	unsigned int	has_dsp:1;
--	unsigned int	has_uart0:1;
--	unsigned int	has_uart1:1;
- 	unsigned int	use_fallback_sprom:1;
- 
- 	/* ethernet config */
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
 @@ -20,7 +20,6 @@
@@ -193,7 +182,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -323,7 +313,6 @@ static struct board_info __initdata boar
+@@ -315,7 +305,6 @@ static struct board_info __initdata boar
  	.name				= "96348GW-11",
  	.expected_cpu_id		= 0x6348,
  
@@ -201,7 +190,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -378,7 +367,6 @@ static struct board_info __initdata boar
+@@ -370,7 +359,6 @@ static struct board_info __initdata boar
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
  
@@ -209,7 +198,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -437,7 +425,6 @@ static struct board_info __initdata boar
+@@ -421,7 +409,6 @@ static struct board_info __initdata boar
  	.name				= "F@ST2404",
  	.expected_cpu_id		= 0x6348,
  
@@ -217,7 +206,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -482,7 +469,6 @@ static struct board_info __initdata boar
+@@ -466,7 +453,6 @@ static struct board_info __initdata boar
  	.name				= "DV201AMR",
  	.expected_cpu_id		= 0x6348,
  
@@ -225,7 +214,7 @@
  	.has_pci			= 1,
  	.use_fallback_sprom		= 1,
  	.has_ohci0			= 1,
-@@ -503,7 +489,6 @@ static struct board_info __initdata boar
+@@ -487,7 +473,6 @@ static struct board_info __initdata boar
  	.name				= "96348GW-A",
  	.expected_cpu_id		= 0x6348,
  
@@ -233,7 +222,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -530,7 +515,6 @@ static struct board_info __initdata boar
+@@ -514,7 +499,6 @@ static struct board_info __initdata boar
  	.name				= "96358VW",
  	.expected_cpu_id		= 0x6358,
  
@@ -241,7 +230,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -583,7 +567,6 @@ static struct board_info __initdata boar
+@@ -567,7 +551,6 @@ static struct board_info __initdata boar
  	.name				= "96358VW2",
  	.expected_cpu_id		= 0x6358,
  
@@ -249,7 +238,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -633,7 +616,6 @@ static struct board_info __initdata boar
+@@ -617,7 +600,6 @@ static struct board_info __initdata boar
  	.name				= "AGPF-S0",
  	.expected_cpu_id		= 0x6358,
  
@@ -257,3 +246,14 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
+--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
++++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
+@@ -32,8 +32,6 @@ struct board_info {
+ 	unsigned int	has_ohci0:1;
+ 	unsigned int	has_ehci0:1;
+ 	unsigned int	has_usbd:1;
+-	unsigned int	has_uart0:1;
+-	unsigned int	has_uart1:1;
+ 	unsigned int	use_fallback_sprom:1;
+ 
+ 	/* ethernet config */

target/linux/brcm63xx/patches-4.14/392-MIPS-BCM63XX-remove-leds-and-buttons.patch

@@ -169,11 +169,10 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96348gw_10 = {
-@@ -278,35 +153,6 @@ static struct board_info __initdata boar
- 		.cs			= 2,
- 		.ext_irq		= 2,
- 	},
--
+@@ -271,34 +146,6 @@ static struct board_info __initdata boar
+ 	.has_pccard			= 1,
+ 	.has_ehci0			= 1,
+ 
 -	.leds = {
 -		{
 -			.name		= "adsl-fail",
@@ -205,7 +204,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96348gw_11 = {
-@@ -332,35 +178,6 @@ static struct board_info __initdata boar
+@@ -324,35 +171,6 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_pccard = 1,
  	.has_ehci0 = 1,
@@ -241,11 +240,10 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96348gw = {
-@@ -390,35 +207,6 @@ static struct board_info __initdata boar
- 		.ext_irq		= 2,
- 		.cs			= 2,
- 	},
--
+@@ -375,34 +193,6 @@ static struct board_info __initdata boar
+ 
+ 	.has_ohci0 = 1,
+ 
 -	.leds = {
 -		{
 -			.name		= "adsl-fail",
@@ -277,7 +275,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_FAST2404 = {
-@@ -534,33 +322,6 @@ static struct board_info __initdata boar
+@@ -518,33 +308,6 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_pccard = 1,
  	.has_ehci0 = 1,
@@ -311,7 +309,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96358vw2 = {
-@@ -587,29 +348,6 @@ static struct board_info __initdata boar
+@@ -571,29 +334,6 @@ static struct board_info __initdata boar
  	.has_pccard = 1,
  	.has_ehci0 = 1,
  	.num_usbh_ports			= 2,

target/linux/brcm63xx/patches-4.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch

@@ -39,15 +39,15 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -10,6 +10,7 @@
+@@ -9,6 +9,7 @@
+ #include <bcm63xx_dev_enet.h>
  #include <bcm63xx_dev_usb_usbd.h>
- #include <bcm63xx_dev_dsp.h>
  #include <bcm63xx_fallback_sprom.h>
 +#include <pci_ath9k_fixup.h>
  
  /*
   * flash mapping
-@@ -17,6 +18,11 @@
+@@ -16,6 +17,11 @@
  #define BCM963XX_CFE_VERSION_OFFSET	0x570
  #define BCM963XX_NVRAM_OFFSET		0x580
  
@@ -59,9 +59,9 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  /*
   * board definition
   */
-@@ -35,6 +41,10 @@ struct board_info {
+@@ -33,6 +39,10 @@ struct board_info {
+ 	unsigned int	has_ehci0:1;
  	unsigned int	has_usbd:1;
- 	unsigned int	has_dsp:1;
  	unsigned int	use_fallback_sprom:1;
 +	unsigned int	has_caldata:2;
 +

target/linux/brcm63xx/patches-4.14/416-BCM63XX-add-a-fixup-for-ath9k-devices.patch

@@ -13,12 +13,14 @@ Subject: [PATCH 61/72] BCM63XX: add a fixup for ath9k devices
 
 --- a/arch/mips/bcm63xx/Makefile
 +++ b/arch/mips/bcm63xx/Makefile
-@@ -3,7 +3,7 @@ obj-y		+= clk.o cpu.o cs.o gpio.o irq.o
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- 		   dev-pcmcia.o dev-rng.o \
- 		   dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
--		   usb-common.o sprom.o
-+		   pci-ath9k-fixup.o usb-common.o sprom.o
+@@ -1,8 +1,8 @@
+ # SPDX-License-Identifier: GPL-2.0
+ obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+-		   dev-rng.o dev-wdt.o dev-usb-ehci.o \
+-		   dev-usb-ohci.o dev-usb-usbd.o usb-common.o sprom.o
++		   dev-rng.o dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o \
++		   dev-usb-usbd.o pci-ath9k-fixup.o usb-common.o sprom.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  
  obj-y		+= boards/

target/linux/brcm63xx/patches-4.14/420-BCM63XX-add-endian-check-for-ath9k.patch

@@ -11,7 +11,7 @@
  #endif /* _PCI_ATH9K_FIXUP */
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -21,6 +21,7 @@
+@@ -20,6 +20,7 @@
  struct ath9k_caldata {
  	unsigned int	slot;
  	u32		caldata_offset;

target/linux/brcm63xx/patches-4.14/421-BCM63XX-add-led-pin-for-ath9k.patch

@@ -30,7 +30,7 @@
  		return;
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -22,6 +22,8 @@ struct ath9k_caldata {
+@@ -21,6 +21,8 @@ struct ath9k_caldata {
  	unsigned int	slot;
  	u32		caldata_offset;
  	unsigned int	endian_check:1;

target/linux/brcm63xx/patches-4.14/422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch

@@ -17,12 +17,13 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
 
 --- a/arch/mips/bcm63xx/Makefile
 +++ b/arch/mips/bcm63xx/Makefile
-@@ -3,7 +3,7 @@ obj-y		+= clk.o cpu.o cs.o gpio.o irq.o
- 		   setup.o timer.o dev-dsp.o dev-enet.o dev-flash.o \
- 		   dev-pcmcia.o dev-rng.o \
- 		   dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o dev-usb-usbd.o \
--		   pci-ath9k-fixup.o usb-common.o sprom.o
-+		   pci-ath9k-fixup.o pci-rt2x00-fixup.o usb-common.o sprom.o
+@@ -2,7 +2,8 @@
+ obj-y		+= clk.o cpu.o cs.o gpio.o irq.o nvram.o prom.o reset.o \
+ 		   setup.o timer.o dev-enet.o dev-flash.o dev-pcmcia.o \
+ 		   dev-rng.o dev-wdt.o dev-usb-ehci.o dev-usb-ohci.o \
+-		   dev-usb-usbd.o pci-ath9k-fixup.o usb-common.o sprom.o
++		   dev-usb-usbd.o pci-ath9k-fixup.o pci-rt2x00-fixup.o \
++		   usb-common.o sprom.o
  obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
  
  obj-y		+= boards/
@@ -136,15 +137,15 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
 +
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -11,6 +11,7 @@
- #include <bcm63xx_dev_dsp.h>
+@@ -10,6 +10,7 @@
+ #include <bcm63xx_dev_usb_usbd.h>
  #include <bcm63xx_fallback_sprom.h>
  #include <pci_ath9k_fixup.h>
 +#include <pci_rt2x00_fixup.h>
  
  /*
   * flash mapping
-@@ -18,12 +19,16 @@
+@@ -17,12 +18,16 @@
  #define BCM963XX_CFE_VERSION_OFFSET	0x570
  #define BCM963XX_NVRAM_OFFSET		0x580
  
@@ -162,7 +163,7 @@ Subject: [PATCH 72/72] 446-BCM63XX-add-a-fixup-for-rt2x00-devices
  };
  
  /*
-@@ -47,7 +52,7 @@ struct board_info {
+@@ -45,7 +50,7 @@ struct board_info {
  	unsigned int	has_caldata:2;
  
  	/* wifi calibration data config */

target/linux/brcm63xx/patches-4.14/427-boards_probe_switch.patch

@@ -27,7 +27,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -170,6 +176,8 @@ static struct board_info __initdata boar
+@@ -163,6 +169,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -36,7 +36,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -194,6 +202,8 @@ static struct board_info __initdata boar
+@@ -187,6 +195,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -45,7 +45,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -224,6 +234,8 @@ static struct board_info __initdata boar
+@@ -210,6 +220,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -54,7 +54,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -247,6 +259,8 @@ static struct board_info __initdata boar
+@@ -233,6 +245,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -63,7 +63,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -268,6 +282,8 @@ static struct board_info __initdata boar
+@@ -254,6 +268,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -72,7 +72,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -287,6 +303,8 @@ static struct board_info __initdata boar
+@@ -273,6 +289,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -81,7 +81,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -314,6 +332,8 @@ static struct board_info __initdata boar
+@@ -300,6 +318,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -90,7 +90,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -339,6 +359,8 @@ static struct board_info __initdata boar
+@@ -325,6 +345,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -99,7 +99,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -364,6 +386,8 @@ static struct board_info __initdata boar
+@@ -350,6 +372,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -108,7 +108,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -387,6 +411,8 @@ static struct board_info __initdata boar
+@@ -373,6 +397,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {

target/linux/brcm63xx/patches-4.14/499-allow_better_context_for_board_patches.patch

@@ -36,7 +36,7 @@
  
  /*
   * known 6348 boards
-@@ -311,7 +311,7 @@ static struct board_info __initdata boar
+@@ -297,7 +297,7 @@ static struct board_info __initdata boar
  
  	.has_ohci0 = 1,
  };
@@ -45,7 +45,7 @@
  
  /*
   * known 6358 boards
-@@ -419,7 +419,7 @@ static struct board_info __initdata boar
+@@ -405,7 +405,7 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  };

target/linux/brcm63xx/patches-4.14/500-board-D4PW.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -311,6 +311,21 @@ static struct board_info __initdata boar
+@@ -297,6 +297,21 @@ static struct board_info __initdata boar
  
  	.has_ohci0 = 1,
  };
@@ -22,7 +22,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -447,6 +462,7 @@ static const struct board_info __initcon
+@@ -433,6 +448,7 @@ static const struct board_info __initcon
  	&board_DV201AMR,
  	&board_96348gw_a,
  	&board_rta1025w_16,
@@ -30,7 +30,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -478,6 +494,7 @@ static struct of_device_id const bcm963x
+@@ -464,6 +480,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/brcm63xx/patches-4.14/501-board-NB4.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -434,6 +434,60 @@ static struct board_info __initdata boar
+@@ -420,6 +420,60 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  };
@@ -61,7 +61,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -470,6 +524,8 @@ static const struct board_info __initcon
+@@ -456,6 +510,8 @@ static const struct board_info __initcon
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
@@ -70,7 +70,7 @@
  #endif
  };
  
-@@ -511,6 +567,8 @@ static struct of_device_id const bcm963x
+@@ -497,6 +553,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/brcm63xx/patches-4.14/502-board-96338W2_E7T.patch

@@ -21,7 +21,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -503,6 +517,7 @@ static const struct board_info __initcon
+@@ -489,6 +503,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
  	&board_96338w,
@@ -29,7 +29,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -540,6 +555,7 @@ static struct of_device_id const bcm963x
+@@ -526,6 +541,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/brcm63xx/patches-4.14/503-board-CPVA642.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -401,6 +401,25 @@ static struct board_info __initdata boar
+@@ -387,6 +387,25 @@ static struct board_info __initdata boar
  	.num_usbh_ports			= 2,
  };
  
@@ -26,7 +26,7 @@
  static struct board_info __initdata board_AGPFS0 = {
  	.name				= "AGPF-S0",
  	.expected_cpu_id		= 0x6358,
-@@ -538,6 +557,7 @@ static const struct board_info __initcon
+@@ -524,6 +543,7 @@ static const struct board_info __initcon
  	&board_96358vw,
  	&board_96358vw2,
  	&board_AGPFS0,
@@ -34,7 +34,7 @@
  	&board_DWVS0,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
-@@ -585,6 +605,7 @@ static struct of_device_id const bcm963x
+@@ -571,6 +591,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
  	{ .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
  	{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },

target/linux/brcm63xx/patches-4.14/504-board_dsl_274xb_rev_c.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -468,6 +468,22 @@ static struct board_info __initdata boar
+@@ -454,6 +454,22 @@ static struct board_info __initdata boar
  	.has_ohci0			= 1,
  };
  
@@ -23,7 +23,7 @@
  static struct board_info __initdata board_nb4_ser_r0 = {
  	.name				= "NB4-SER-r0",
  	.expected_cpu_id		= 0x6358,
-@@ -559,6 +575,7 @@ static const struct board_info __initcon
+@@ -545,6 +561,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
-@@ -598,6 +615,7 @@ static struct of_device_id const bcm963x
+@@ -584,6 +601,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/brcm63xx/patches-4.14/505-board_spw500v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -340,6 +340,44 @@ static struct board_info __initdata boar
+@@ -326,6 +326,44 @@ static struct board_info __initdata boar
  		.force_duplex_full	= 1,
  	},
  };
@@ -45,7 +45,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -567,6 +605,7 @@ static const struct board_info __initcon
+@@ -553,6 +591,7 @@ static const struct board_info __initcon
  	&board_96348gw_a,
  	&board_rta1025w_16,
  	&board_96348_D4PW,
@@ -53,7 +53,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -608,6 +647,7 @@ static struct of_device_id const bcm963x
+@@ -594,6 +633,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
  	{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },

target/linux/brcm63xx/patches-4.14/506-board_gw6200_gw6000.patch

@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -233,6 +233,64 @@ static struct board_info __initdata boar
- 	},
+@@ -219,6 +219,64 @@ static struct board_info __initdata boar
+ 
  };
  
 +static struct board_info __initdata board_gw6200 = {
@@ -65,7 +65,7 @@
  static struct board_info __initdata board_FAST2404 = {
  	.name				= "F@ST2404",
  	.expected_cpu_id		= 0x6348,
-@@ -598,6 +656,8 @@ static const struct board_info __initcon
+@@ -584,6 +642,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
  	&board_96348gw,
@@ -74,7 +74,7 @@
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
-@@ -648,6 +708,8 @@ static struct of_device_id const bcm963x
+@@ -634,6 +694,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },
  	{ .compatible = "t-com,spw500v", .data = &board_spw500v, },

target/linux/brcm63xx/patches-4.14/507-board-MAGIC.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -436,6 +436,39 @@ static struct board_info __initdata boar
+@@ -422,6 +422,39 @@ static struct board_info __initdata boar
  		.num_board_fixups	= ARRAY_SIZE(spw500v_fixups),
  	},
  };
@@ -40,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -666,6 +699,7 @@ static const struct board_info __initcon
+@@ -652,6 +685,7 @@ static const struct board_info __initcon
  	&board_rta1025w_16,
  	&board_96348_D4PW,
  	&board_spw500v,
@@ -48,7 +48,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -710,6 +744,7 @@ static struct of_device_id const bcm963x
+@@ -696,6 +730,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,spw500v", .data = &board_spw500v, },
  	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
  	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },

target/linux/brcm63xx/patches-4.14/508-board_hw553.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -666,6 +666,32 @@ static struct board_info __initdata boar
+@@ -652,6 +652,32 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  	.num_usbh_ports			= 2,
  };
@@ -33,7 +33,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -711,6 +737,7 @@ static const struct board_info __initcon
+@@ -697,6 +723,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
@@ -41,7 +41,7 @@
  #endif
  };
  
-@@ -754,6 +781,7 @@ static struct of_device_id const bcm963x
+@@ -740,6 +767,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/brcm63xx/patches-4.14/509-board_rta1320_16m.patch

@@ -21,7 +21,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -708,6 +722,7 @@ static const struct board_info __initcon
+@@ -694,6 +708,7 @@ static const struct board_info __initcon
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,
@@ -29,7 +29,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -752,6 +767,7 @@ static struct of_device_id const bcm963x
+@@ -738,6 +753,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/brcm63xx/patches-4.14/510-board_spw303v.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -706,6 +706,20 @@ static struct board_info __initdata boar
+@@ -692,6 +692,20 @@ static struct board_info __initdata boar
  		.pci_dev			= 1,
  	},
  };
@@ -21,7 +21,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -753,6 +767,7 @@ static const struct board_info __initcon
+@@ -739,6 +753,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_HW553,
@@ -29,7 +29,7 @@
  #endif
  };
  
-@@ -804,6 +819,7 @@ static struct of_device_id const bcm963x
+@@ -790,6 +805,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
  	{ .compatible = "sfr,nb4-ser-r0", .data = &board_nb4_ser_r0, },
  	{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },

target/linux/brcm63xx/patches-4.14/511-board_V2500V.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -483,6 +483,26 @@ static struct board_info __initdata boar
+@@ -469,6 +469,26 @@ static struct board_info __initdata boar
  		.ext_irq		= 2,
  	},
  };
@@ -27,7 +27,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -755,6 +775,7 @@ static const struct board_info __initcon
+@@ -741,6 +761,7 @@ static const struct board_info __initcon
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
@@ -35,7 +35,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -794,6 +815,7 @@ static struct of_device_id const bcm963x
+@@ -780,6 +801,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, },
@@ -43,7 +43,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, },
-@@ -853,6 +875,22 @@ void __init board_bcm963xx_init(void)
+@@ -839,6 +861,22 @@ void __init board_bcm963xx_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);

target/linux/brcm63xx/patches-4.14/512-board_BTV2110.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -216,6 +216,24 @@ static struct board_info __initdata boar
+@@ -209,6 +209,24 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -25,7 +25,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -776,6 +794,7 @@ static const struct board_info __initcon
+@@ -762,6 +780,7 @@ static const struct board_info __initcon
  	&board_spw500v,
  	&board_96348sv,
  	&board_V2500V_BB,
@@ -33,7 +33,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -815,6 +834,7 @@ static struct of_device_id const bcm963x
+@@ -801,6 +820,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/brcm63xx/patches-4.14/514-board_ct536_ct5621.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -234,6 +234,33 @@ static struct board_info __initdata boar
+@@ -227,6 +227,33 @@ static struct board_info __initdata boar
  };
  
  
@@ -34,7 +34,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -795,6 +822,7 @@ static const struct board_info __initcon
+@@ -781,6 +808,7 @@ static const struct board_info __initcon
  	&board_96348sv,
  	&board_V2500V_BB,
  	&board_V2110,
@@ -42,7 +42,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -836,6 +864,8 @@ static struct of_device_id const bcm963x
+@@ -822,6 +850,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
  	{ .compatible = "bt,v2110", .data = &board_V2110, },
  	{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },

target/linux/brcm63xx/patches-4.14/515-board_DWV-S0_fixes.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -674,6 +674,7 @@ static struct board_info __initdata boar
+@@ -660,6 +660,7 @@ static struct board_info __initdata boar
  	},
  
  	.has_ohci0			= 1,

target/linux/brcm63xx/patches-4.14/516-board_96348A-122.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -261,6 +261,30 @@ static struct board_info __initdata boar
+@@ -254,6 +254,30 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -31,7 +31,7 @@
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -824,6 +848,7 @@ static const struct board_info __initcon
+@@ -810,6 +834,7 @@ static const struct board_info __initcon
  	&board_V2500V_BB,
  	&board_V2110,
  	&board_ct536_ct5621,
@@ -39,7 +39,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -866,6 +891,7 @@ static struct of_device_id const bcm963x
+@@ -852,6 +877,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,v2110", .data = &board_V2110, },
  	{ .compatible = "bt,v2500v-bb", .data = &board_V2500V_BB, },
  	{ .compatible = "comtrend,ct-536+", .data = &board_ct536_ct5621, },

target/linux/brcm63xx/patches-4.14/519_board_CPVA502plus.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -233,6 +233,33 @@ static struct board_info __initdata boar
+@@ -226,6 +226,33 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -34,7 +34,7 @@
  
  static struct board_info __initdata board_ct536_ct5621 = {
  	.name				= "CT536_CT5621",
-@@ -849,6 +876,7 @@ static const struct board_info __initcon
+@@ -835,6 +862,7 @@ static const struct board_info __initcon
  	&board_V2110,
  	&board_ct536_ct5621,
  	&board_96348A_122,
@@ -42,7 +42,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -901,6 +929,7 @@ static struct of_device_id const bcm963x
+@@ -887,6 +915,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,spw500v", .data = &board_spw500v, },
  	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
  	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },

target/linux/brcm63xx/patches-4.14/520-bcm63xx-add-support-for-96368MVWG-board.patch

@@ -10,7 +10,7 @@ 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
-@@ -840,6 +840,58 @@ static struct board_info __initdata boar
+@@ -826,6 +826,58 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -69,7 +69,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -891,6 +943,10 @@ static const struct board_info __initcon
+@@ -877,6 +929,10 @@ static const struct board_info __initcon
  	&board_HW553,
  	&board_spw303v,
  #endif
@@ -80,7 +80,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -951,6 +1007,7 @@ static struct of_device_id const bcm963x
+@@ -937,6 +993,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

target/linux/brcm63xx/patches-4.14/521-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
-@@ -889,6 +889,45 @@ static struct board_info __initdata boar
+@@ -875,6 +875,45 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -55,7 +55,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -946,6 +985,7 @@ static const struct board_info __initcon
+@@ -932,6 +971,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
@@ -63,7 +63,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  };
  
-@@ -1007,6 +1047,7 @@ static struct of_device_id const bcm963x
+@@ -993,6 +1033,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

target/linux/brcm63xx/patches-4.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch

@@ -50,7 +50,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -966,6 +1000,7 @@ static const struct board_info __initcon
+@@ -952,6 +986,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -58,7 +58,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1022,6 +1057,7 @@ static struct of_device_id const bcm963x
+@@ -1008,6 +1043,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

target/linux/brcm63xx/patches-4.14/524-board_dsl_274xb_rev_f.patch

@@ -62,7 +62,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1001,6 +1046,7 @@ static const struct board_info __initcon
+@@ -987,6 +1032,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
@@ -70,7 +70,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1059,6 +1105,7 @@ static struct of_device_id const bcm963x
+@@ -1045,6 +1091,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/brcm63xx/patches-4.14/525-board_96348w3.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -600,6 +600,24 @@ static struct board_info __initdata boar
+@@ -586,6 +586,24 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
@@ -25,7 +25,7 @@
  static struct board_info __initdata board_96348_D4PW = {
  	.name				= "D-4P-W",
  	.expected_cpu_id		= 0x6348,
-@@ -1076,6 +1094,7 @@ static const struct board_info __initcon
+@@ -1062,6 +1080,7 @@ static const struct board_info __initcon
  	&board_ct536_ct5621,
  	&board_96348A_122,
  	&board_CPVA502plus,
@@ -33,7 +33,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1131,6 +1150,7 @@ static struct of_device_id const bcm963x
+@@ -1117,6 +1136,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
  	{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },

target/linux/brcm63xx/patches-4.14/526-board_CT6373-1.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -922,6 +922,30 @@ static struct board_info __initdata boar
+@@ -908,6 +908,30 @@ static struct board_info __initdata boar
  	.num_usbh_ports			= 2,
  };
  
@@ -31,7 +31,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -1106,6 +1130,7 @@ static const struct board_info __initcon
+@@ -1092,6 +1116,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
-@@ -1164,6 +1189,7 @@ static struct of_device_id const bcm963x
+@@ -1150,6 +1175,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/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -985,6 +985,35 @@ static struct board_info __initdata boar
+@@ -971,6 +971,35 @@ static struct board_info __initdata boar
  		.use_internal_phy 	= 1,
  	},
  };
@@ -36,7 +36,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1133,6 +1162,7 @@ static const struct board_info __initcon
+@@ -1119,6 +1148,7 @@ static const struct board_info __initcon
  	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,
@@ -44,7 +44,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1192,6 +1222,7 @@ static struct of_device_id const bcm963x
+@@ -1178,6 +1208,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/brcm63xx/patches-4.14/528-board_nb6.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1016,6 +1016,32 @@ static struct board_info __initdata boar
+@@ -1002,6 +1002,32 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -33,7 +33,7 @@
  /*
   * known 6368 boards
   */
-@@ -1165,6 +1191,10 @@ static const struct board_info __initcon
+@@ -1151,6 +1177,10 @@ static const struct board_info __initcon
  	&board_DVAG3810BN,
  #endif
  
@@ -44,7 +44,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
-@@ -1233,6 +1263,9 @@ static struct of_device_id const bcm963x
+@@ -1219,6 +1249,9 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif

target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -533,6 +533,22 @@ static struct board_info __initdata boar
+@@ -519,6 +519,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,
-@@ -1162,6 +1178,7 @@ static const struct board_info __initcon
+@@ -1148,6 +1164,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,
-@@ -1237,6 +1254,7 @@ static struct of_device_id const bcm963x
+@@ -1223,6 +1240,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gtpn", .data = &board_96348gw_10, },
   	{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
  	{ .compatible = "sagem,f@st2404", .data = &board_FAST2404, },

target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch

@@ -50,7 +50,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
  	.name				= "AW4339U",
  	.expected_cpu_id		= 0x6328,
-@@ -1159,6 +1202,7 @@ static const struct board_info __initcon
+@@ -1145,6 +1188,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
@@ -58,7 +58,7 @@
  	&board_dsl_274xb_f1,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1224,6 +1268,7 @@ static struct of_device_id const bcm963x
+@@ -1210,6 +1254,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch

@@ -79,7 +79,7 @@
  static struct board_info __initdata board_963281TAN = {
  	.name				= "963281TAN",
  	.expected_cpu_id		= 0x6328,
-@@ -1201,6 +1273,7 @@ static const struct board_info __initcon
+@@ -1187,6 +1259,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -87,7 +87,7 @@
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
-@@ -1271,6 +1344,7 @@ static struct of_device_id const bcm963x
+@@ -1257,6 +1330,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/brcm63xx/patches-4.14/532-board_AR-5381u.patch

@@ -61,7 +61,7 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
  	{ .offset = 2, .value = 0x05bb },
  	{ .offset = 65, .value = 0x1204 },
-@@ -1273,6 +1327,7 @@ static const struct board_info __initcon
+@@ -1259,6 +1313,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -69,7 +69,7 @@
  	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,
-@@ -1344,6 +1399,7 @@ static struct of_device_id const bcm963x
+@@ -1330,6 +1385,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/brcm63xx/patches-4.14/533-board_rta770bw.patch

@@ -21,7 +21,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1341,6 +1355,7 @@ static const struct board_info __initcon
+@@ -1327,6 +1341,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
@@ -29,7 +29,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
-@@ -1411,6 +1426,7 @@ static struct of_device_id const bcm963x
+@@ -1397,6 +1412,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },

target/linux/brcm63xx/patches-4.14/534-board_hw556.patch

@@ -8,7 +8,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1171,6 +1172,92 @@ static struct board_info __initdata boar
+@@ -1157,6 +1158,92 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -101,7 +101,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
  	.name			= "96358-502V",
-@@ -1391,6 +1478,9 @@ static const struct board_info __initcon
+@@ -1377,6 +1464,9 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
  	&board_HW553,
@@ -111,7 +111,7 @@
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif
-@@ -1463,6 +1553,9 @@ static struct of_device_id const bcm963x
+@@ -1449,6 +1539,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,hg553", .data = &board_HW553, },

target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch

@@ -26,7 +26,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1443,6 +1462,7 @@ static const struct board_info __initcon
+@@ -1429,6 +1448,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
  	&board_rta770bw,
@@ -34,7 +34,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
-@@ -1517,6 +1537,7 @@ static struct of_device_id const bcm963x
+@@ -1503,6 +1523,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6345
  	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
  	{ .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },

target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch

@@ -56,7 +56,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1452,6 +1489,7 @@ static const struct board_info __initcon
+@@ -1438,6 +1475,7 @@ static const struct board_info __initcon
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
@@ -64,7 +64,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1527,6 +1565,7 @@ static struct of_device_id const bcm963x
+@@ -1513,6 +1551,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-f", .data = &board_dsl_274xb_f1, },

target/linux/brcm63xx/patches-4.14/537-board_fast2504n.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
-@@ -1382,6 +1382,41 @@ static struct board_info __initdata boar
+@@ -1368,6 +1368,41 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -48,7 +48,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -1545,6 +1580,7 @@ static const struct board_info __initcon
+@@ -1531,6 +1566,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
@@ -56,7 +56,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1626,6 +1662,7 @@ static struct of_device_id const bcm963x
+@@ -1612,6 +1648,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362

target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch

@@ -56,7 +56,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1517,6 +1566,9 @@ static const struct board_info __initcon
+@@ -1503,6 +1552,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
  	&board_cvg834g,
  #endif
@@ -66,7 +66,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_AR5381u,
-@@ -1594,6 +1646,9 @@ static struct of_device_id const bcm963x
+@@ -1580,6 +1632,9 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_3368
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif

target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch

@@ -51,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1568,6 +1612,7 @@ static const struct board_info __initcon
+@@ -1554,6 +1598,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
@@ -59,7 +59,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -1648,6 +1693,7 @@ static struct of_device_id const bcm963x
+@@ -1634,6 +1679,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },

target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1604,6 +1604,50 @@ static struct board_info __initdata boar
+@@ -1590,6 +1590,50 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -51,7 +51,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1684,6 +1728,9 @@ static const struct board_info __initcon
+@@ -1670,6 +1714,9 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  #endif
@@ -61,7 +61,7 @@
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1771,6 +1818,7 @@ static struct of_device_id const bcm963x
+@@ -1757,6 +1804,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268

target/linux/brcm63xx/patches-4.14/558-board_AR1004G.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
-@@ -655,6 +655,21 @@ static struct board_info __initdata boar
+@@ -648,6 +648,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 = {
-@@ -1699,6 +1714,7 @@ static const struct board_info __initcon
+@@ -1685,6 +1700,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
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1763,6 +1779,7 @@ static struct of_device_id const bcm963x
+@@ -1749,6 +1765,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348

target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1660,6 +1660,51 @@ static struct board_info __initdata boar
+@@ -1646,6 +1646,51 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -52,7 +52,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -1746,6 +1791,7 @@ static const struct board_info __initcon
+@@ -1732,6 +1777,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963269bhr,
@@ -60,7 +60,7 @@
  #endif
  };
  
-@@ -1836,6 +1882,7 @@ static struct of_device_id const bcm963x
+@@ -1822,6 +1868,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },

target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1622,6 +1622,64 @@ static struct board_info __initdata boar
+@@ -1608,6 +1608,64 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -65,7 +65,7 @@
  static struct board_info __initdata board_963269bhr = {
  	.name				= "963269BHR",
  	.expected_cpu_id		= 0x63268,
-@@ -1790,6 +1848,7 @@ static const struct board_info __initcon
+@@ -1776,6 +1834,7 @@ static const struct board_info __initcon
  	&board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -73,7 +73,7 @@
  	&board_963269bhr,
  	&board_vw6339gu,
  #endif
-@@ -1881,6 +1940,7 @@ static struct of_device_id const bcm963x
+@@ -1867,6 +1926,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268

target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch

@@ -9,7 +9,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1616,6 +1618,47 @@ static struct board_info __initdata boar
+@@ -1602,6 +1604,47 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -57,7 +57,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1846,6 +1889,7 @@ static const struct board_info __initcon
+@@ -1832,6 +1875,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -65,7 +65,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
-@@ -1938,6 +1982,7 @@ static struct of_device_id const bcm963x
+@@ -1924,6 +1968,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/brcm63xx/patches-4.14/562-board_VR-3025u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1619,6 +1619,59 @@ static struct board_info __initdata boar
+@@ -1605,6 +1605,59 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -60,7 +60,7 @@
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1889,6 +1942,7 @@ static const struct board_info __initcon
+@@ -1875,6 +1928,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -68,7 +68,7 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1982,6 +2036,7 @@ static struct of_device_id const bcm963x
+@@ -1968,6 +2022,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/brcm63xx/patches-4.14/563-board_VR-3025un.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1672,6 +1672,59 @@ static struct board_info __initdata boar
+@@ -1658,6 +1658,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -60,7 +60,7 @@
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1943,6 +1996,7 @@ static const struct board_info __initcon
+@@ -1929,6 +1982,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_VR3025u,
@@ -68,7 +68,7 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2037,6 +2091,7 @@ static struct of_device_id const bcm963x
+@@ -2023,6 +2077,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/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1628,6 +1628,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1614,6 +1614,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,
-@@ -1995,6 +2037,7 @@ static const struct board_info __initcon
+@@ -1981,6 +2023,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -57,7 +57,7 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_WAP5813n,
-@@ -2093,6 +2136,7 @@ static struct of_device_id const bcm963x
+@@ -2079,6 +2122,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/brcm63xx/patches-4.14/565-board_hw520.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1312,6 +1312,36 @@ static struct board_info __initdata boar
+@@ -1298,6 +1298,36 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -37,7 +37,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -2021,6 +2051,7 @@ static const struct board_info __initcon
+@@ -2007,6 +2037,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,
-@@ -2113,6 +2144,7 @@ static struct of_device_id const bcm963x
+@@ -2099,6 +2130,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/brcm63xx/patches-4.14/566-board_A4001N.patch

@@ -50,7 +50,7 @@
  static struct board_info __initdata board_A4001N1 = {
  	.name					= "963281T_TEF",
  	.expected_cpu_id			= 0x6328,
-@@ -2002,6 +2045,7 @@ static const struct board_info __initcon
+@@ -1988,6 +2031,7 @@ static const struct board_info __initcon
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
@@ -58,7 +58,7 @@
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
-@@ -2090,6 +2134,7 @@ static struct of_device_id const bcm963x
+@@ -2076,6 +2120,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328