From: Daniel Gonzalez Cabanelas <dgcbueu@gmail.com>
Date: Thu, 27 Dec 2018 11:33:03 +0000 (+0100)
Subject: brcm63xx: DVA-G3810BN/TL: Fix the WAN ethernet port
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d1a015f8cad3a5cd5dcd967031cff7b4e6bbdc47;p=openwrt%2Fstaging%2Fmkresin.git

brcm63xx: DVA-G3810BN/TL: Fix the WAN ethernet port

The WAN port has the wrong configuration in the kernel for the DVA-G3810BN/TL

The WAN port uses the internal phy, but it isn't enabled at the kernel board data.

Fix it.

Signed-off-by: Daniel Gonzalez Cabanelas <dgcbueu@gmail.com>
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
---

diff --git a/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch
index 15194a0ea9..53d7890a45 100644
--- a/target/linux/brcm63xx/patches-4.14/527-board_dva-g3810bn-tl-1.patch
+++ b/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
-@@ -937,6 +937,35 @@ static struct board_info __initdata boar
+@@ -937,6 +937,33 @@ static struct board_info __initdata boar
  		.use_internal_phy 	= 1,
  	},
  };
@@ -15,10 +15,8 @@
 +	.has_pci		= 1,
 +
 +	.enet0 = {
-+		.has_phy		= 0,
++		.has_phy		= 1,
 +		.use_internal_phy	= 1,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
 +	},
 +
 +	.enet1 = {
@@ -36,7 +34,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1085,6 +1114,7 @@ static const struct board_info __initcon
+@@ -1085,6 +1112,7 @@ static const struct board_info __initcon
  	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,
@@ -44,7 +42,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1144,6 +1174,7 @@ static struct of_device_id const bcm963x
+@@ -1144,6 +1172,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch
index a51e5e3ee0..349478d4f7 100644
--- a/target/linux/brcm63xx/patches-4.14/528-board_nb6.patch
+++ b/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
-@@ -968,6 +968,32 @@ static struct board_info __initdata boar
+@@ -966,6 +966,32 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -33,7 +33,7 @@
  /*
   * known 6368 boards
   */
-@@ -1117,6 +1143,10 @@ static const struct board_info __initcon
+@@ -1115,6 +1141,10 @@ static const struct board_info __initcon
  	&board_DVAG3810BN,
  #endif
  
@@ -44,7 +44,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
-@@ -1185,6 +1215,9 @@ static struct of_device_id const bcm963x
+@@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
diff --git a/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch b/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch
index 098b69dc7a..b4b7352a00 100644
--- a/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-4.14/529-board_fast2604.patch
@@ -23,7 +23,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
  	.name				= "RTA1025W_16",
  	.expected_cpu_id		= 0x6348,
-@@ -1114,6 +1130,7 @@ static const struct board_info __initcon
+@@ -1112,6 +1128,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,
-@@ -1189,6 +1206,7 @@ static struct of_device_id const bcm963x
+@@ -1187,6 +1204,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch
index a7ac6f8267..8e83bc2e93 100644
--- a/target/linux/brcm63xx/patches-4.14/530-board_A4001N1.patch
+++ b/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,
-@@ -1111,6 +1154,7 @@ static const struct board_info __initcon
+@@ -1109,6 +1152,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
-@@ -1176,6 +1220,7 @@ static struct of_device_id const bcm963x
+@@ -1174,6 +1218,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
diff --git a/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch
index 32a264cb1d..b9e50ce383 100644
--- a/target/linux/brcm63xx/patches-4.14/531-board_AR-5387un.patch
+++ b/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,
-@@ -1153,6 +1225,7 @@ static const struct board_info __initcon
+@@ -1151,6 +1223,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,
-@@ -1223,6 +1296,7 @@ static struct of_device_id const bcm963x
+@@ -1221,6 +1294,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch
index 5596a67302..679a408215 100644
--- a/target/linux/brcm63xx/patches-4.14/532-board_AR-5381u.patch
+++ b/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 },
-@@ -1225,6 +1279,7 @@ static const struct board_info __initcon
+@@ -1223,6 +1277,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,
-@@ -1296,6 +1351,7 @@ static struct of_device_id const bcm963x
+@@ -1294,6 +1349,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch
index 4cf7d61389..d56df55622 100644
--- a/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-4.14/533-board_rta770bw.patch
@@ -21,7 +21,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1293,6 +1307,7 @@ static const struct board_info __initcon
+@@ -1291,6 +1305,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,
-@@ -1363,6 +1378,7 @@ static struct of_device_id const bcm963x
+@@ -1361,6 +1376,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
diff --git a/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch b/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch
index 718b287ee6..731860983a 100644
--- a/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-4.14/534-board_hw556.patch
@@ -101,7 +101,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
  	.name			= "96358-502V",
-@@ -1343,6 +1430,9 @@ static const struct board_info __initcon
+@@ -1341,6 +1428,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
-@@ -1415,6 +1505,9 @@ static struct of_device_id const bcm963x
+@@ -1413,6 +1503,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch b/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch
index 0e64c5d3a4..c78e59efd3 100644
--- a/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-4.14/535-board_rta770w.patch
@@ -26,7 +26,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1395,6 +1414,7 @@ static const struct board_info __initcon
+@@ -1393,6 +1412,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,
-@@ -1469,6 +1489,7 @@ static struct of_device_id const bcm963x
+@@ -1467,6 +1487,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch
index 021239309d..9eb2d3e44e 100644
--- a/target/linux/brcm63xx/patches-4.14/536-board_fast2704.patch
+++ b/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 */
  
  /*
-@@ -1404,6 +1441,7 @@ static const struct board_info __initcon
+@@ -1402,6 +1439,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,
-@@ -1479,6 +1517,7 @@ static struct of_device_id const bcm963x
+@@ -1477,6 +1515,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch
index bb5698ba3a..8059184c78 100644
--- a/target/linux/brcm63xx/patches-4.14/537-board_fast2504n.patch
+++ b/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
-@@ -1334,6 +1334,41 @@ static struct board_info __initdata boar
+@@ -1332,6 +1332,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 */
  
  /*
-@@ -1497,6 +1532,7 @@ static const struct board_info __initcon
+@@ -1495,6 +1530,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
-@@ -1578,6 +1614,7 @@ static struct of_device_id const bcm963x
+@@ -1576,6 +1612,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362
diff --git a/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch b/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch
index 8223d5c8f6..3c929793be 100644
--- a/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-4.14/555-board_96318ref.patch
@@ -56,7 +56,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1469,6 +1518,9 @@ static const struct board_info __initcon
+@@ -1467,6 +1516,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,
-@@ -1546,6 +1598,9 @@ static struct of_device_id const bcm963x
+@@ -1544,6 +1596,9 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_3368
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
diff --git a/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch
index 222e21651e..bfce6f8df5 100644
--- a/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-4.14/556-board_96318ref_p300.patch
@@ -51,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1520,6 +1564,7 @@ static const struct board_info __initcon
+@@ -1518,6 +1562,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,
-@@ -1600,6 +1645,7 @@ static struct of_device_id const bcm963x
+@@ -1598,6 +1643,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
diff --git a/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch
index dd3c4b4852..d5af2f0d1c 100644
--- a/target/linux/brcm63xx/patches-4.14/557-board_bcm963269bhr.patch
+++ b/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
-@@ -1556,6 +1556,50 @@ static struct board_info __initdata boar
+@@ -1554,6 +1554,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[] = {
-@@ -1636,6 +1680,9 @@ static const struct board_info __initcon
+@@ -1634,6 +1678,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[] = {
-@@ -1723,6 +1770,7 @@ static struct of_device_id const bcm963x
+@@ -1721,6 +1768,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch
index 53cbddd806..60256391dd 100644
--- a/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-4.14/558-board_AR1004G.patch
@@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -1651,6 +1666,7 @@ static const struct board_info __initcon
+@@ -1649,6 +1664,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
-@@ -1715,6 +1731,7 @@ static struct of_device_id const bcm963x
+@@ -1713,6 +1729,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348
diff --git a/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch
index 329b62440f..355bdb2767 100644
--- a/target/linux/brcm63xx/patches-4.14/559-board_vw6339gu.patch
+++ b/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
-@@ -1612,6 +1612,51 @@ static struct board_info __initdata boar
+@@ -1610,6 +1610,51 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -52,7 +52,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -1698,6 +1743,7 @@ static const struct board_info __initcon
+@@ -1696,6 +1741,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963269bhr,
@@ -60,7 +60,7 @@
  #endif
  };
  
-@@ -1788,6 +1834,7 @@ static struct of_device_id const bcm963x
+@@ -1786,6 +1832,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
diff --git a/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch
index aa7ed4979c..26c236898e 100644
--- a/target/linux/brcm63xx/patches-4.14/560-board_963268gu_p300.patch
+++ b/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
-@@ -1574,6 +1574,64 @@ static struct board_info __initdata boar
+@@ -1572,6 +1572,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,
-@@ -1742,6 +1800,7 @@ static const struct board_info __initcon
+@@ -1740,6 +1798,7 @@ static const struct board_info __initcon
  	&board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -73,7 +73,7 @@
  	&board_963269bhr,
  	&board_vw6339gu,
  #endif
-@@ -1833,6 +1892,7 @@ static struct of_device_id const bcm963x
+@@ -1831,6 +1890,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch
index 33b89992a6..abd5114374 100644
--- a/target/linux/brcm63xx/patches-4.14/561-board_WAP-5813n.patch
+++ b/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>
-@@ -1568,6 +1570,47 @@ static struct board_info __initdata boar
+@@ -1566,6 +1568,47 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -57,7 +57,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1798,6 +1841,7 @@ static const struct board_info __initcon
+@@ -1796,6 +1839,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,
-@@ -1890,6 +1934,7 @@ static struct of_device_id const bcm963x
+@@ -1888,6 +1932,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch
index 096620eadd..36014ea49a 100644
--- a/target/linux/brcm63xx/patches-4.14/562-board_VR-3025u.patch
+++ b/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
-@@ -1571,6 +1571,59 @@ static struct board_info __initdata boar
+@@ -1569,6 +1569,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 },
-@@ -1841,6 +1894,7 @@ static const struct board_info __initcon
+@@ -1839,6 +1892,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
-@@ -1934,6 +1988,7 @@ static struct of_device_id const bcm963x
+@@ -1932,6 +1986,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch
index 8128575615..a34b7a1f3f 100644
--- a/target/linux/brcm63xx/patches-4.14/563-board_VR-3025un.patch
+++ b/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
-@@ -1624,6 +1624,59 @@ static struct board_info __initdata boar
+@@ -1622,6 +1622,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 },
-@@ -1895,6 +1948,7 @@ static const struct board_info __initcon
+@@ -1893,6 +1946,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
-@@ -1989,6 +2043,7 @@ static struct of_device_id const bcm963x
+@@ -1987,6 +2041,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch
index 5a08a3939c..1e49ad457a 100644
--- a/target/linux/brcm63xx/patches-4.14/564-board_P870HW-51a_v2.patch
+++ b/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
-@@ -1580,6 +1580,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1578,6 +1578,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,
-@@ -1947,6 +1989,7 @@ static const struct board_info __initcon
+@@ -1945,6 +1987,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,
-@@ -2045,6 +2088,7 @@ static struct of_device_id const bcm963x
+@@ -2043,6 +2086,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch b/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch
index 1210dfc68a..53ea1232b3 100644
--- a/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch
+++ b/target/linux/brcm63xx/patches-4.14/565-board_hw520.patch
@@ -37,7 +37,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -1973,6 +2003,7 @@ static const struct board_info __initcon
+@@ -1971,6 +2001,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,
-@@ -2065,6 +2096,7 @@ static struct of_device_id const bcm963x
+@@ -2063,6 +2094,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch b/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch
index 83503cc244..75c0c5bcdc 100644
--- a/target/linux/brcm63xx/patches-4.14/566-board_A4001N.patch
+++ b/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,
-@@ -1954,6 +1997,7 @@ static const struct board_info __initcon
+@@ -1952,6 +1995,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,
-@@ -2042,6 +2086,7 @@ static struct of_device_id const bcm963x
+@@ -2040,6 +2084,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
diff --git a/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch
index 8a37dbef64..93e5c9fff9 100644
--- a/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch
+++ b/target/linux/brcm63xx/patches-4.14/567-board_dsl-2751b_e1.patch
@@ -75,7 +75,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1991,6 +2059,7 @@ static const struct board_info __initcon
+@@ -1989,6 +2057,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
@@ -83,7 +83,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2084,6 +2153,7 @@ static struct of_device_id const bcm963x
+@@ -2082,6 +2151,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
diff --git a/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch b/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch
index 5b5601ed32..aa40412e4a 100644
--- a/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch
+++ b/target/linux/brcm63xx/patches-4.14/568-board_DGND3700v1_3800B.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1712,6 +1712,30 @@ static struct board_info __initdata boar
+@@ -1710,6 +1710,30 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -31,7 +31,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2133,6 +2157,7 @@ static const struct board_info __initcon
+@@ -2131,6 +2155,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -39,7 +39,7 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2235,6 +2260,7 @@ static struct of_device_id const bcm963x
+@@ -2233,6 +2258,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch b/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch
index 35d409831e..d2b78780a2 100644
--- a/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch
+++ b/target/linux/brcm63xx/patches-4.14/569-board_homehub2a.patch
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_HW520 = {
  	.name				= "HW6358GW_B",
  	.expected_cpu_id		= 0x6358,
-@@ -2140,6 +2165,7 @@ static const struct board_info __initcon
+@@ -2138,6 +2163,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
@@ -40,7 +40,7 @@
  	&board_HW520,
  	&board_HW553,
  	&board_HW556_A,
-@@ -2249,6 +2275,7 @@ static struct of_device_id const bcm963x
+@@ -2247,6 +2273,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,nb4-fxc-r1", .data = &board_nb4_fxc_r1, },
  	{ .compatible = "t-com,spw303v", .data = &board_spw303v, },
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
diff --git a/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch b/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch
index 2075461742..8523af685b 100644
--- a/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch
+++ b/target/linux/brcm63xx/patches-4.14/570-board_HG655b.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1761,6 +1761,52 @@ static struct board_info __initdata boar
+@@ -1759,6 +1759,52 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2184,6 +2230,7 @@ static const struct board_info __initcon
+@@ -2182,6 +2228,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -61,7 +61,7 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2287,6 +2334,7 @@ static struct of_device_id const bcm963x
+@@ -2285,6 +2332,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch
index 6c399b0133..62eb3f1034 100644
--- a/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch
+++ b/target/linux/brcm63xx/patches-4.14/571-board_fast2704n.patch
@@ -46,7 +46,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2155,6 +2194,7 @@ static const struct board_info __initcon
+@@ -2153,6 +2192,7 @@ static const struct board_info __initcon
  	&board_96318ref,
  	&board_96318ref_p300,
  	&board_dsl_2751b_d1,
@@ -54,7 +54,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2252,6 +2292,7 @@ static struct of_device_id const bcm963x
+@@ -2250,6 +2290,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
  	{ .compatible = "d-link,dsl-275xb-d", .data = &board_dsl_2751b_d1, },
diff --git a/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch b/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch
index f41700a1fc..59e0389bae 100644
--- a/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch
+++ b/target/linux/brcm63xx/patches-4.14/572-board_VR-3026e.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1994,6 +1994,59 @@ static struct board_info __initdata boar
+@@ -1992,6 +1992,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 },
-@@ -2274,6 +2327,7 @@ static const struct board_info __initcon
+@@ -2272,6 +2325,7 @@ static const struct board_info __initcon
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
@@ -68,7 +68,7 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2374,6 +2428,7 @@ static struct of_device_id const bcm963x
+@@ -2372,6 +2426,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
diff --git a/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch b/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch
index 93004db050..059e7c0cb4 100644
--- a/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch
+++ b/target/linux/brcm63xx/patches-4.14/573-board_R5010UNv2.patch
@@ -51,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2258,6 +2302,7 @@ static const struct board_info __initcon
+@@ -2256,6 +2300,7 @@ static const struct board_info __initcon
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
@@ -59,7 +59,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -2356,6 +2401,7 @@ static struct of_device_id const bcm963x
+@@ -2354,6 +2399,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, },
diff --git a/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch b/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch
index 2bd09a0f5c..3ec7a077e4 100644
--- a/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch
+++ b/target/linux/brcm63xx/patches-4.14/574-board_HG622.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1890,6 +1890,52 @@ static struct board_info __initdata boar
+@@ -1888,6 +1888,52 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2368,6 +2414,7 @@ static const struct board_info __initcon
+@@ -2366,6 +2412,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -61,7 +61,7 @@
  	&board_HG655b,
  	&board_P870HW51A_V2,
  	&board_VR3025u,
-@@ -2476,6 +2523,7 @@ static struct of_device_id const bcm963x
+@@ -2474,6 +2521,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
diff --git a/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch b/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch
index c156a7f08e..9d068f27ee 100644
--- a/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch
+++ b/target/linux/brcm63xx/patches-4.14/575-board_EVG2000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1844,6 +1844,42 @@ static struct board_info __initdata boar
+@@ -1842,6 +1842,42 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -43,7 +43,7 @@
  static struct board_info __initdata board_HG655b = {
  	.name				= "HW65x",
  	.expected_cpu_id		= 0x6368,
-@@ -2414,6 +2450,7 @@ static const struct board_info __initcon
+@@ -2412,6 +2448,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -51,7 +51,7 @@
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
-@@ -2526,6 +2563,7 @@ static struct of_device_id const bcm963x
+@@ -2524,6 +2561,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "huawei,hg622", .data = &board_HG622, },
  	{ .compatible = "huawei,hg655b", .data = &board_HG655b, },
  	{ .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, },
diff --git a/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch b/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch
index 2307e3eaf8..d106c27027 100644
--- a/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch
+++ b/target/linux/brcm63xx/patches-4.14/576-board_AV4202N.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1734,6 +1734,51 @@ static struct board_info __initdata boar
+@@ -1732,6 +1732,51 @@ static struct board_info __initdata boar
   * known 6368 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -52,7 +52,7 @@
  static struct board_info __initdata board_96368mvwg = {
  	.name				= "96368MVWG",
  	.expected_cpu_id		= 0x6368,
-@@ -2447,6 +2492,7 @@ static const struct board_info __initcon
+@@ -2445,6 +2490,7 @@ static const struct board_info __initcon
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -60,7 +60,7 @@
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
-@@ -2554,6 +2600,7 @@ static struct of_device_id const bcm963x
+@@ -2552,6 +2598,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch b/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch
index b1a76433b6..9a4727a210 100644
--- a/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch
+++ b/target/linux/brcm63xx/patches-4.14/577-board_VH4032N.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2218,6 +2218,106 @@ static struct board_info __initdata boar
+@@ -2216,6 +2216,106 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -107,7 +107,7 @@
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2500,6 +2600,7 @@ static const struct board_info __initcon
+@@ -2498,6 +2598,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -115,7 +115,7 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_VR3026e,
-@@ -2611,6 +2712,7 @@ static struct of_device_id const bcm963x
+@@ -2609,6 +2710,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "huawei,hg655b", .data = &board_HG655b, },
  	{ .compatible = "netgear,dgnd3700v1", .data = &board_DGND3700v1_3800B, },
  	{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },
diff --git a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch b/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch
index 313dff4e46..e52cdb07ec 100644
--- a/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch
+++ b/target/linux/brcm63xx/patches-4.14/578-board_R1000H.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2068,6 +2068,29 @@ static struct board_info __initdata boar
+@@ -2066,6 +2066,29 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -30,7 +30,7 @@
  static struct board_info __initdata board_VR3025u = {
  	.name					= "96368M-1541N",
  	.expected_cpu_id		= 0x6368,
-@@ -2600,6 +2623,7 @@ static const struct board_info __initcon
+@@ -2598,6 +2621,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -38,7 +38,7 @@
  	&board_VH4032N,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2701,6 +2725,7 @@ static struct of_device_id const bcm963x
+@@ -2699,6 +2723,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,nb6-ser-r0", .data = &board_nb6, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch b/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch
index e4e163cfdf..e7a6ed6119 100644
--- a/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch
+++ b/target/linux/brcm63xx/patches-4.14/579-board_AR-5315u.patch
@@ -68,7 +68,7 @@
  static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
  	{ .offset = 96, .value = 0x2046 },
  	{ .offset = 97, .value = 0xfe9d },
-@@ -2540,6 +2601,7 @@ static const struct board_info __initcon
+@@ -2538,6 +2599,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
@@ -76,7 +76,7 @@
  	&board_dsl_2751b_d1,
  	&board_FAST2704N,
  #endif
-@@ -2645,6 +2707,7 @@ static struct of_device_id const bcm963x
+@@ -2643,6 +2705,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref_p300", .data = &board_96318ref_p300, },
diff --git a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch b/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch
index 4ccdb046c8..6d12c61222 100644
--- a/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch
+++ b/target/linux/brcm63xx/patches-4.14/580-board_AD1018.patch
@@ -74,7 +74,7 @@
  static struct sprom_fixup __initdata ar5381u_fixups[] = {
  	{ .offset = 97, .value = 0xfee5 },
  	{ .offset = 98, .value = 0x157c },
-@@ -2607,6 +2674,7 @@ static const struct board_info __initcon
+@@ -2605,6 +2672,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -82,7 +82,7 @@
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
-@@ -2721,6 +2789,7 @@ static struct of_device_id const bcm963x
+@@ -2719,6 +2787,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-274xb-f", .data = &board_dsl_274xb_f1, },
  	{ .compatible = "nucom,r5010unv2", .data = &board_R5010UNV2, },
  	{ .compatible = "sagem,f@st2704v2", .data = &board_FAST2704V2, },
diff --git a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch b/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch
index bb5eb491c1..d790ea7109 100644
--- a/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch
+++ b/target/linux/brcm63xx/patches-4.14/598-board_sr102.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2656,6 +2656,49 @@ static struct board_info __initdata boar
+@@ -2654,6 +2654,49 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -50,7 +50,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2764,6 +2807,7 @@ static const struct board_info __initcon
+@@ -2762,6 +2805,7 @@ static const struct board_info __initcon
  	&board_963268bu_p300,
  	&board_963269bhr,
  	&board_vw6339gu,
@@ -58,7 +58,7 @@
  #endif
  };
  
-@@ -2876,6 +2920,7 @@ static struct of_device_id const bcm963x
+@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
  	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },