From: Daniel Gonzalez Cabanelas <dgcbueu@gmail.com>
Date: Tue, 14 Feb 2017 15:37:18 +0000 (+0100)
Subject: brcm63xx: CPVA502+: add SPROM wifi
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1e4ee5a318582ec183c97630e49bdae865381fd3;p=openwrt%2Fstaging%2Fyousong.git

brcm63xx: CPVA502+: add SPROM wifi

Add SPROM wifi to the kernel board data.

After this fix, the wifi won't work anyway due the lack
of RAM memory (16 MB). It will throw a kernel panic
when loading the b43 drivers.

Signed-off-by: Daniel Gonzalez Cabanelas <dgcbueu@gmail.com>
---

diff --git a/target/linux/brcm63xx/patches-4.4/519_board_CPVA502plus.patch b/target/linux/brcm63xx/patches-4.4/519_board_CPVA502plus.patch
index a2cdfa94ab..5dc69e4680 100644
--- a/target/linux/brcm63xx/patches-4.4/519_board_CPVA502plus.patch
+++ b/target/linux/brcm63xx/patches-4.4/519_board_CPVA502plus.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -429,6 +429,27 @@ static struct board_info __initdata boar
+@@ -429,6 +429,34 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -12,6 +12,7 @@
 +	.has_enet0			= 1,
 +	.has_enet1			= 1,
 +	.has_pci			= 1,
++	.use_fallback_sprom		= 1,
 +
 +	.enet0 = {
 +		.has_phy		= 1,
@@ -24,11 +25,17 @@
 +
 +	.ephy_reset_gpio		= 4,
 +	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
++
++	.fallback_sprom = {
++		.type 				= SPROM_BCM4318,
++		.pci_bus			= 0,
++		.pci_dev			= 1,
++	},
 +};
  
  static struct board_info __initdata board_ct536_ct5621 = {
  	.name				= "CT536_CT5621",
-@@ -1149,6 +1170,7 @@ static const struct board_info __initcon
+@@ -1149,6 +1177,7 @@ static const struct board_info __initcon
  	&board_V2110,
  	&board_ct536_ct5621,
  	&board_96348A_122,
@@ -36,7 +43,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1201,6 +1223,7 @@ static struct of_device_id const bcm963x
+@@ -1201,6 +1230,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, },
diff --git a/target/linux/brcm63xx/patches-4.4/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-4.4/520-bcm63xx-add-support-for-96368MVWG-board.patch
index 763e1faa60..a6b9b9faf8 100644
--- a/target/linux/brcm63xx/patches-4.4/520-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1134,6 +1134,59 @@ static struct board_info __initdata boar
+@@ -1141,6 +1141,59 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -70,7 +70,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1185,6 +1238,10 @@ static const struct board_info __initcon
+@@ -1192,6 +1245,10 @@ static const struct board_info __initcon
  	&board_HW553,
  	&board_spw303v,
  #endif
@@ -81,7 +81,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1245,6 +1302,7 @@ static struct of_device_id const bcm963x
+@@ -1252,6 +1309,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/brcm63xx/patches-4.4/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-4.4/521-bcm63xx-add-support-for-96368MVNgr-board.patch
index 77bba17e38..0a5cd6c5b4 100644
--- a/target/linux/brcm63xx/patches-4.4/521-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1184,6 +1184,46 @@ static struct board_info __initdata boar
+@@ -1191,6 +1191,46 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -56,7 +56,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1241,6 +1281,7 @@ static const struct board_info __initcon
+@@ -1248,6 +1288,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
@@ -64,7 +64,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif
  };
  
-@@ -1302,6 +1343,7 @@ static struct of_device_id const bcm963x
+@@ -1309,6 +1350,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/brcm63xx/patches-4.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-4.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 64c9798132..d6f732a88e 100644
--- a/target/linux/brcm63xx/patches-4.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/brcm63xx/patches-4.4/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -51,7 +51,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1262,6 +1297,7 @@ static const struct board_info __initcon
+@@ -1269,6 +1304,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -59,7 +59,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1318,6 +1354,7 @@ static struct of_device_id const bcm963x
+@@ -1325,6 +1361,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.4/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-4.4/524-board_dsl_274xb_rev_f.patch
index a3e3995a20..f89f01f99f 100644
--- a/target/linux/brcm63xx/patches-4.4/524-board_dsl_274xb_rev_f.patch
+++ b/target/linux/brcm63xx/patches-4.4/524-board_dsl_274xb_rev_f.patch
@@ -63,7 +63,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1298,6 +1344,7 @@ static const struct board_info __initcon
+@@ -1305,6 +1351,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
@@ -71,7 +71,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1356,6 +1403,7 @@ static struct of_device_id const bcm963x
+@@ -1363,6 +1410,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, },
diff --git a/target/linux/brcm63xx/patches-4.4/525-board_96348w3.patch b/target/linux/brcm63xx/patches-4.4/525-board_96348w3.patch
index c2de926c2f..7f9b3caa4b 100644
--- a/target/linux/brcm63xx/patches-4.4/525-board_96348w3.patch
+++ b/target/linux/brcm63xx/patches-4.4/525-board_96348w3.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -830,6 +830,25 @@ static struct board_info __initdata boar
+@@ -837,6 +837,25 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
@@ -26,7 +26,7 @@
  static struct board_info __initdata board_96348_D4PW = {
  	.name				= "D-4P-W",
  	.expected_cpu_id		= 0x6348,
-@@ -1374,6 +1393,7 @@ static const struct board_info __initcon
+@@ -1381,6 +1400,7 @@ static const struct board_info __initcon
  	&board_ct536_ct5621,
  	&board_96348A_122,
  	&board_CPVA502plus,
@@ -34,7 +34,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1429,6 +1449,7 @@ static struct of_device_id const bcm963x
+@@ -1436,6 +1456,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, },
diff --git a/target/linux/brcm63xx/patches-4.4/526-board_CT6373-1.patch b/target/linux/brcm63xx/patches-4.4/526-board_CT6373-1.patch
index f710b2a83a..52839a34a9 100644
--- a/target/linux/brcm63xx/patches-4.4/526-board_CT6373-1.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1216,6 +1216,31 @@ static struct board_info __initdata boar
+@@ -1223,6 +1223,31 @@ static struct board_info __initdata boar
  	.num_usbh_ports			= 2,
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -1405,6 +1430,7 @@ static const struct board_info __initcon
+@@ -1412,6 +1437,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
@@ -40,7 +40,7 @@
  	&board_HW553,
  	&board_spw303v,
  #endif
-@@ -1463,6 +1489,7 @@ static struct of_device_id const bcm963x
+@@ -1470,6 +1496,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, },
diff --git a/target/linux/brcm63xx/patches-4.4/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-4.4/527-board_dva-g3810bn-tl-1.patch
index dd8a5dee5c..7d211f973f 100644
--- a/target/linux/brcm63xx/patches-4.4/527-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1283,6 +1283,36 @@ static struct board_info __initdata boar
+@@ -1290,6 +1290,36 @@ static struct board_info __initdata boar
  		.use_internal_phy 	= 1,
  	},
  };
@@ -37,7 +37,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1433,6 +1463,7 @@ static const struct board_info __initcon
+@@ -1440,6 +1470,7 @@ static const struct board_info __initcon
  	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,
@@ -45,7 +45,7 @@
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1492,6 +1523,7 @@ static struct of_device_id const bcm963x
+@@ -1499,6 +1530,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.4/528-board_nb6.patch b/target/linux/brcm63xx/patches-4.4/528-board_nb6.patch
index 5f1d47a150..915d48dea9 100644
--- a/target/linux/brcm63xx/patches-4.4/528-board_nb6.patch
+++ b/target/linux/brcm63xx/patches-4.4/528-board_nb6.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1315,6 +1315,34 @@ static struct board_info __initdata boar
+@@ -1322,6 +1322,34 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
@@ -35,7 +35,7 @@
  /*
   * known 6368 boards
   */
-@@ -1466,6 +1494,10 @@ static const struct board_info __initcon
+@@ -1473,6 +1501,10 @@ static const struct board_info __initcon
  	&board_DVAG3810BN,
  #endif
  
@@ -46,7 +46,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
-@@ -1534,6 +1566,9 @@ static struct of_device_id const bcm963x
+@@ -1541,6 +1573,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.4/529-board_fast2604.patch b/target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch
index f5342567fd..09cf1b7a94 100644
--- a/target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch
+++ b/target/linux/brcm63xx/patches-4.4/529-board_fast2604.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -760,6 +760,23 @@ static struct board_info __initdata boar
+@@ -767,6 +767,23 @@ static struct board_info __initdata boar
  	.has_ehci0			= 1,
  };
  
@@ -24,7 +24,7 @@
  static struct board_info __initdata board_rta1025w_16 = {
  	.name				= "RTA1025W_16",
  	.expected_cpu_id		= 0x6348,
-@@ -1465,6 +1482,7 @@ static const struct board_info __initcon
+@@ -1472,6 +1489,7 @@ static const struct board_info __initcon
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
@@ -32,7 +32,7 @@
  	&board_DV201AMR,
  	&board_96348gw_a,
  	&board_rta1025w_16,
-@@ -1540,6 +1558,7 @@ static struct of_device_id const bcm963x
+@@ -1547,6 +1565,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.4/530-board_A4001N1.patch b/target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch
index 3366875e4f..8094c36520 100644
--- a/target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch
+++ b/target/linux/brcm63xx/patches-4.4/530-board_A4001N1.patch
@@ -51,7 +51,7 @@
  static struct board_info __initdata board_dsl_274xb_f1 = {
  	.name				= "AW4339U",
  	.expected_cpu_id		= 0x6328,
-@@ -1463,6 +1507,7 @@ static const struct board_info __initcon
+@@ -1470,6 +1514,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
@@ -59,7 +59,7 @@
  	&board_dsl_274xb_f1,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1528,6 +1573,7 @@ static struct of_device_id const bcm963x
+@@ -1535,6 +1580,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.4/531-board_AR-5387un.patch b/target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch
index 650db33e9e..5cac3be43a 100644
--- a/target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch
+++ b/target/linux/brcm63xx/patches-4.4/531-board_AR-5387un.patch
@@ -80,7 +80,7 @@
  static struct board_info __initdata board_963281TAN = {
  	.name				= "963281TAN",
  	.expected_cpu_id		= 0x6328,
-@@ -1506,6 +1579,7 @@ static const struct board_info __initcon
+@@ -1513,6 +1586,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -88,7 +88,7 @@
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
-@@ -1576,6 +1650,7 @@ static struct of_device_id const bcm963x
+@@ -1583,6 +1657,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.4/532-board_AR-5381u.patch b/target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch
index f9062fe58d..ef8b2200ce 100644
--- a/target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch
+++ b/target/linux/brcm63xx/patches-4.4/532-board_AR-5381u.patch
@@ -62,7 +62,7 @@
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
  	{ .offset = 2, .value = 0x05bb },
  	{ .offset = 65, .value = 0x1204 },
-@@ -1579,6 +1634,7 @@ static const struct board_info __initcon
+@@ -1586,6 +1641,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -70,7 +70,7 @@
  	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,
-@@ -1650,6 +1706,7 @@ static struct of_device_id const bcm963x
+@@ -1657,6 +1713,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.4/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch
index c7f9b50345..61f3ee23a0 100644
--- a/target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch
+++ b/target/linux/brcm63xx/patches-4.4/533-board_rta770bw.patch
@@ -23,7 +23,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1648,6 +1664,7 @@ static const struct board_info __initcon
+@@ -1655,6 +1671,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
@@ -31,7 +31,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
-@@ -1718,6 +1735,7 @@ static struct of_device_id const bcm963x
+@@ -1725,6 +1742,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.4/534-board_hw556.patch b/target/linux/brcm63xx/patches-4.4/534-board_hw556.patch
index 3da90f36be..e59f1aa02d 100644
--- a/target/linux/brcm63xx/patches-4.4/534-board_hw556.patch
+++ b/target/linux/brcm63xx/patches-4.4/534-board_hw556.patch
@@ -8,7 +8,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1474,6 +1475,95 @@ static struct board_info __initdata boar
+@@ -1481,6 +1482,95 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -104,7 +104,7 @@
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
  	.name			= "96358-502V",
-@@ -1700,6 +1790,9 @@ static const struct board_info __initcon
+@@ -1707,6 +1797,9 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
  	&board_HW553,
@@ -114,7 +114,7 @@
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif
-@@ -1772,6 +1865,9 @@ static struct of_device_id const bcm963x
+@@ -1779,6 +1872,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.4/535-board_rta770w.patch b/target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch
index 8088cda1af..e3b7724b8f 100644
--- a/target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch
+++ b/target/linux/brcm63xx/patches-4.4/535-board_rta770w.patch
@@ -28,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1755,6 +1776,7 @@ static const struct board_info __initcon
+@@ -1762,6 +1783,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
  	&board_rta770bw,
@@ -36,7 +36,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
-@@ -1829,6 +1851,7 @@ static struct of_device_id const bcm963x
+@@ -1836,6 +1858,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.4/536-board_fast2704.patch b/target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch
index 1b7eb1c35e..1cdef8b308 100644
--- a/target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch
+++ b/target/linux/brcm63xx/patches-4.4/536-board_fast2704.patch
@@ -57,7 +57,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1766,6 +1804,7 @@ static const struct board_info __initcon
+@@ -1773,6 +1811,7 @@ static const struct board_info __initcon
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
@@ -65,7 +65,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1841,6 +1880,7 @@ static struct of_device_id const bcm963x
+@@ -1848,6 +1887,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.4/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-4.4/537-board_fast2504n.patch
index c77fa1787a..d5ecc3c4c7 100644
--- a/target/linux/brcm63xx/patches-4.4/537-board_fast2504n.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1695,6 +1695,43 @@ static struct board_info __initdata boar
+@@ -1702,6 +1702,43 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -50,7 +50,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -1860,6 +1897,7 @@ static const struct board_info __initcon
+@@ -1867,6 +1904,7 @@ static const struct board_info __initcon
  
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
@@ -58,7 +58,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1941,6 +1979,7 @@ static struct of_device_id const bcm963x
+@@ -1948,6 +1986,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.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
index d4b14b4c31..2ae8107acd 100644
--- a/target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
+++ b/target/linux/brcm63xx/patches-4.4/550-MIPS-BCM63XX-remove-leds-and-buttons.patch
@@ -241,7 +241,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  
-@@ -890,35 +707,6 @@ static struct board_info __initdata boar
+@@ -897,35 +714,6 @@ static struct board_info __initdata boar
  		.ext_irq		= 2,
  		.cs			= 2,
  	},
@@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_gw6200 = {
-@@ -1255,33 +1043,6 @@ static struct board_info __initdata boar
+@@ -1262,33 +1050,6 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_pccard = 1,
  	.has_ehci0 = 1,
@@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96358vw2 = {
-@@ -1311,29 +1072,6 @@ static struct board_info __initdata boar
+@@ -1318,29 +1079,6 @@ static struct board_info __initdata boar
  	.has_pccard = 1,
  	.has_ehci0 = 1,
  	.num_usbh_ports			= 2,
diff --git a/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch b/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch
index d68b3c5f4c..f0949f9ed1 100644
--- a/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch
+++ b/target/linux/brcm63xx/patches-4.4/555-board_96318ref.patch
@@ -57,7 +57,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1572,6 +1622,9 @@ static const struct board_info __initcon
+@@ -1579,6 +1629,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
  	&board_cvg834g,
  #endif
@@ -67,7 +67,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_AR5381u,
-@@ -1649,6 +1702,9 @@ static struct of_device_id const bcm963x
+@@ -1656,6 +1709,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.4/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch
index b17c9d5f5c..eda826e13f 100644
--- a/target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch
+++ b/target/linux/brcm63xx/patches-4.4/556-board_96318ref_p300.patch
@@ -52,7 +52,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1624,6 +1669,7 @@ static const struct board_info __initcon
+@@ -1631,6 +1676,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
@@ -60,7 +60,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -1704,6 +1750,7 @@ static struct of_device_id const bcm963x
+@@ -1711,6 +1757,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.4/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch
index d6fc6a9c71..2d5dc607b6 100644
--- a/target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch
+++ b/target/linux/brcm63xx/patches-4.4/557-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1661,6 +1661,52 @@ static struct board_info __initdata boar
+@@ -1668,6 +1668,52 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -53,7 +53,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1741,6 +1787,9 @@ static const struct board_info __initcon
+@@ -1748,6 +1794,9 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  #endif
@@ -63,7 +63,7 @@
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1828,6 +1877,7 @@ static struct of_device_id const bcm963x
+@@ -1835,6 +1884,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.4/558-board_AR1004G.patch b/target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch
index 774509b0c4..a312b4137b 100644
--- a/target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch
+++ b/target/linux/brcm63xx/patches-4.4/558-board_AR1004G.patch
@@ -31,7 +31,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -1758,6 +1774,7 @@ static const struct board_info __initcon
+@@ -1765,6 +1781,7 @@ static const struct board_info __initcon
  	&board_96348A_122,
  	&board_CPVA502plus,
  	&board_96348W3,
@@ -39,7 +39,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1822,6 +1839,7 @@ static struct of_device_id const bcm963x
+@@ -1829,6 +1846,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.4/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch
index 601aea0d37..b9dd163d65 100644
--- a/target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch
+++ b/target/linux/brcm63xx/patches-4.4/559-board_vw6339gu.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1720,6 +1720,53 @@ static struct board_info __initdata boar
+@@ -1727,6 +1727,53 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -54,7 +54,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -1806,6 +1853,7 @@ static const struct board_info __initcon
+@@ -1813,6 +1860,7 @@ static const struct board_info __initcon
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963269bhr,
@@ -62,7 +62,7 @@
  #endif
  };
  
-@@ -1896,6 +1944,7 @@ static struct of_device_id const bcm963x
+@@ -1903,6 +1951,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.4/560-board_963268gu_p300.patch b/target/linux/brcm63xx/patches-4.4/560-board_963268gu_p300.patch
index a3b12b25c5..7a8575e705 100644
--- a/target/linux/brcm63xx/patches-4.4/560-board_963268gu_p300.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1680,6 +1680,66 @@ static struct board_info __initdata boar
+@@ -1687,6 +1687,66 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -67,7 +67,7 @@
  static struct board_info __initdata board_963269bhr = {
  	.name				= "963269BHR",
  	.expected_cpu_id		= 0x63268,
-@@ -1852,6 +1912,7 @@ static const struct board_info __initcon
+@@ -1859,6 +1919,7 @@ static const struct board_info __initcon
  	&board_96368mvngr,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -75,7 +75,7 @@
  	&board_963269bhr,
  	&board_vw6339gu,
  #endif
-@@ -1943,6 +2004,7 @@ static struct of_device_id const bcm963x
+@@ -1950,6 +2011,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.4/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch
index 5e7402a3cc..f6b80371fd 100644
--- a/target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-4.4/561-board_WAP-5813n.patch
@@ -9,7 +9,7 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1674,6 +1676,65 @@ static struct board_info __initdata boar
+@@ -1681,6 +1683,65 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -75,7 +75,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1910,6 +1971,7 @@ static const struct board_info __initcon
+@@ -1917,6 +1978,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -83,7 +83,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
-@@ -2002,6 +2064,7 @@ static struct of_device_id const bcm963x
+@@ -2009,6 +2071,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.4/562-board_VR-3025u.patch b/target/linux/brcm63xx/patches-4.4/562-board_VR-3025u.patch
index 5e33598fc5..5d5ce7e351 100644
--- a/target/linux/brcm63xx/patches-4.4/562-board_VR-3025u.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1677,6 +1677,60 @@ static struct board_info __initdata boar
+@@ -1684,6 +1684,60 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -61,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -1971,6 +2025,7 @@ static const struct board_info __initcon
+@@ -1978,6 +2032,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -69,7 +69,7 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2064,6 +2119,7 @@ static struct of_device_id const bcm963x
+@@ -2071,6 +2126,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.4/563-board_VR-3025un.patch b/target/linux/brcm63xx/patches-4.4/563-board_VR-3025un.patch
index a0dd3685cb..0474304687 100644
--- a/target/linux/brcm63xx/patches-4.4/563-board_VR-3025un.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1731,6 +1731,60 @@ static struct board_info __initdata boar
+@@ -1738,6 +1738,60 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -61,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -2026,6 +2080,7 @@ static const struct board_info __initcon
+@@ -2033,6 +2087,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_VR3025u,
@@ -69,7 +69,7 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2120,6 +2175,7 @@ static struct of_device_id const bcm963x
+@@ -2127,6 +2182,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.4/564-board_P870HW-51a_v2.patch b/target/linux/brcm63xx/patches-4.4/564-board_P870HW-51a_v2.patch
index ce24b6c10b..b6f8750f5f 100644
--- a/target/linux/brcm63xx/patches-4.4/564-board_P870HW-51a_v2.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1686,6 +1686,49 @@ static struct sprom_fixup __initdata vr3
+@@ -1693,6 +1693,49 @@ static struct sprom_fixup __initdata vr3
  	{ .offset = 115, .value = 0xfad9 },
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_VR3025u = {
  	.name					= "96368M-1541N",
  	.expected_cpu_id		= 0x6368,
-@@ -2079,6 +2122,7 @@ static const struct board_info __initcon
+@@ -2086,6 +2129,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -58,7 +58,7 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_WAP5813n,
-@@ -2177,6 +2221,7 @@ static struct of_device_id const bcm963x
+@@ -2184,6 +2228,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.4/565-board_hw520.patch b/target/linux/brcm63xx/patches-4.4/565-board_hw520.patch
index 71ba896aaa..3d3b3f09a5 100644
--- a/target/linux/brcm63xx/patches-4.4/565-board_hw520.patch
+++ b/target/linux/brcm63xx/patches-4.4/565-board_hw520.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1357,6 +1357,37 @@ static struct board_info __initdata boar
+@@ -1364,6 +1364,37 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -38,7 +38,7 @@
  static struct board_info __initdata board_HW553 = {
  	.name                           = "HW553",
  	.expected_cpu_id                = 0x6358,
-@@ -2106,6 +2137,7 @@ static const struct board_info __initcon
+@@ -2113,6 +2144,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
@@ -46,7 +46,7 @@
  	&board_HW553,
  	&board_HW556_A,
  	&board_HW556_B,
-@@ -2198,6 +2230,7 @@ static struct of_device_id const bcm963x
+@@ -2205,6 +2237,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.4/566-board_A4001N.patch b/target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch
index 6313cbb758..c323ef766d 100644
--- a/target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch
+++ b/target/linux/brcm63xx/patches-4.4/566-board_A4001N.patch
@@ -51,7 +51,7 @@
  static struct board_info __initdata board_A4001N1 = {
  	.name					= "963281T_TEF",
  	.expected_cpu_id			= 0x6328,
-@@ -2088,6 +2132,7 @@ static const struct board_info __initcon
+@@ -2095,6 +2139,7 @@ static const struct board_info __initcon
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
@@ -59,7 +59,7 @@
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
-@@ -2176,6 +2221,7 @@ static struct of_device_id const bcm963x
+@@ -2183,6 +2228,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.4/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch
index 05c2fd4a9a..fc9c1f3a48 100644
--- a/target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch
+++ b/target/linux/brcm63xx/patches-4.4/567-board_dsl-2751b_e1.patch
@@ -76,7 +76,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2126,6 +2195,7 @@ static const struct board_info __initcon
+@@ -2133,6 +2202,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
@@ -84,7 +84,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2219,6 +2289,7 @@ static struct of_device_id const bcm963x
+@@ -2226,6 +2296,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.4/568-board_DGND3700v1_3800B.patch b/target/linux/brcm63xx/patches-4.4/568-board_DGND3700v1_3800B.patch
index 866ea88e03..368b3959af 100644
--- a/target/linux/brcm63xx/patches-4.4/568-board_DGND3700v1_3800B.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -1821,6 +1821,48 @@ static struct board_info __initdata boar
+@@ -1828,6 +1828,48 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
@@ -49,7 +49,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2269,6 +2311,7 @@ static const struct board_info __initcon
+@@ -2276,6 +2318,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -57,7 +57,7 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2371,6 +2414,7 @@ static struct of_device_id const bcm963x
+@@ -2378,6 +2421,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.4/569-board_homehub2a.patch b/target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch
index b51d6b07af..9ac2edbe12 100644
--- a/target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch
+++ b/target/linux/brcm63xx/patches-4.4/569-board_homehub2a.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1470,6 +1470,32 @@ static struct board_info __initdata boar
+@@ -1477,6 +1477,32 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -33,7 +33,7 @@
  static struct board_info __initdata board_HW520 = {
  	.name				= "HW6358GW_B",
  	.expected_cpu_id		= 0x6358,
-@@ -2294,6 +2320,7 @@ static const struct board_info __initcon
+@@ -2301,6 +2327,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
@@ -41,7 +41,7 @@
  	&board_HW520,
  	&board_HW553,
  	&board_HW556_A,
-@@ -2403,6 +2430,7 @@ static struct of_device_id const bcm963x
+@@ -2410,6 +2437,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.4/570-board_HG655b.patch b/target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch
index 1a0aaaaeba..0afb70fb03 100644
--- a/target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch
+++ b/target/linux/brcm63xx/patches-4.4/570-board_HG655b.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1889,6 +1889,53 @@ static struct board_info __initdata boar
+@@ -1896,6 +1896,53 @@ static struct board_info __initdata boar
  	.num_spis = ARRAY_SIZE(DGND3700v1_3800B_spi_devices),
  };
  
@@ -54,7 +54,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2339,6 +2386,7 @@ static const struct board_info __initcon
+@@ -2346,6 +2393,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -62,7 +62,7 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2442,6 +2490,7 @@ static struct of_device_id const bcm963x
+@@ -2449,6 +2497,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.4/571-board_fast2704n.patch b/target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch
index 249933acdb..954662dcd9 100644
--- a/target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch
+++ b/target/linux/brcm63xx/patches-4.4/571-board_fast2704n.patch
@@ -47,7 +47,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2311,6 +2351,7 @@ static const struct board_info __initcon
+@@ -2318,6 +2358,7 @@ static const struct board_info __initcon
  	&board_96318ref,
  	&board_96318ref_p300,
  	&board_dsl_2751b_d1,
@@ -55,7 +55,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2408,6 +2449,7 @@ static struct of_device_id const bcm963x
+@@ -2415,6 +2456,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.4/572-board_VR-3026e.patch b/target/linux/brcm63xx/patches-4.4/572-board_VR-3026e.patch
index 832728f094..26152e3722 100644
--- a/target/linux/brcm63xx/patches-4.4/572-board_VR-3026e.patch
+++ b/target/linux/brcm63xx/patches-4.4/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
-@@ -2127,6 +2127,60 @@ static struct board_info __initdata boar
+@@ -2134,6 +2134,60 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -61,7 +61,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -2431,6 +2485,7 @@ static const struct board_info __initcon
+@@ -2438,6 +2492,7 @@ static const struct board_info __initcon
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
@@ -69,7 +69,7 @@
  	&board_WAP5813n,
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2531,6 +2586,7 @@ static struct of_device_id const bcm963x
+@@ -2538,6 +2593,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.4/573-board_R5010UNv2.patch b/target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch
index a148bb12b4..61a1ed0ac1 100644
--- a/target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch
+++ b/target/linux/brcm63xx/patches-4.4/573-board_R5010UNv2.patch
@@ -52,7 +52,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2416,6 +2461,7 @@ static const struct board_info __initcon
+@@ -2423,6 +2468,7 @@ static const struct board_info __initcon
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
@@ -60,7 +60,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -2514,6 +2560,7 @@ static struct of_device_id const bcm963x
+@@ -2521,6 +2567,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.4/574-board_HG622.patch b/target/linux/brcm63xx/patches-4.4/574-board_HG622.patch
index 837226fd38..3918a7b463 100644
--- a/target/linux/brcm63xx/patches-4.4/574-board_HG622.patch
+++ b/target/linux/brcm63xx/patches-4.4/574-board_HG622.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2021,6 +2021,53 @@ static struct board_info __initdata boar
+@@ -2028,6 +2028,53 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -54,7 +54,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2527,6 +2574,7 @@ static const struct board_info __initcon
+@@ -2534,6 +2581,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -62,7 +62,7 @@
  	&board_HG655b,
  	&board_P870HW51A_V2,
  	&board_VR3025u,
-@@ -2635,6 +2683,7 @@ static struct of_device_id const bcm963x
+@@ -2642,6 +2690,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.4/575-board_EVG2000.patch b/target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch
index f5f75c80df..ad82785717 100644
--- a/target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch
+++ b/target/linux/brcm63xx/patches-4.4/575-board_EVG2000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1974,6 +1974,43 @@ static struct board_info __initdata boar
+@@ -1981,6 +1981,43 @@ static struct board_info __initdata boar
  	.num_spis = ARRAY_SIZE(DGND3700v1_3800B_spi_devices),
  };
  
@@ -44,7 +44,7 @@
  static struct board_info __initdata board_HG655b = {
  	.name				= "HW65x",
  	.expected_cpu_id		= 0x6368,
-@@ -2574,6 +2611,7 @@ static const struct board_info __initcon
+@@ -2581,6 +2618,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -52,7 +52,7 @@
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
-@@ -2686,6 +2724,7 @@ static struct of_device_id const bcm963x
+@@ -2693,6 +2731,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.4/576-board_AV4202N.patch b/target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch
index be91cd7332..3517068f17 100644
--- a/target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch
+++ b/target/linux/brcm63xx/patches-4.4/576-board_AV4202N.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1844,6 +1844,52 @@ static struct board_info __initdata boar
+@@ -1851,6 +1851,52 @@ static struct board_info __initdata boar
   * known 6368 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -53,7 +53,7 @@
  static struct board_info __initdata board_96368mvwg = {
  	.name				= "96368MVWG",
  	.expected_cpu_id		= 0x6368,
-@@ -2608,6 +2654,7 @@ static const struct board_info __initcon
+@@ -2615,6 +2661,7 @@ static const struct board_info __initcon
  #endif
  
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -61,7 +61,7 @@
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
-@@ -2715,6 +2762,7 @@ static struct of_device_id const bcm963x
+@@ -2722,6 +2769,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.4/577-board_VH4032N.patch b/target/linux/brcm63xx/patches-4.4/577-board_VH4032N.patch
index 2e5c13e577..de7e22b759 100644
--- a/target/linux/brcm63xx/patches-4.4/577-board_VH4032N.patch
+++ b/target/linux/brcm63xx/patches-4.4/577-board_VH4032N.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2356,6 +2356,45 @@ static struct board_info __initdata boar
+@@ -2363,6 +2363,45 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -46,7 +46,7 @@
  static struct b53_platform_data WAP5813n_b53_pdata = {
  	.alias = "eth0",
  };
-@@ -2662,6 +2701,7 @@ static const struct board_info __initcon
+@@ -2669,6 +2708,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -54,7 +54,7 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_VR3026e,
-@@ -2773,6 +2813,7 @@ static struct of_device_id const bcm963x
+@@ -2780,6 +2820,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, },