bcm63xx: remove invalid EHCI nodes

There's no EHCI controller on BCM6348. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
3 years ago · 440d5996ef
60 changed files with 158 additions and 160 deletions
--- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
+++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -392,6 +392,31 @@ static struct board_info __initdata boar
+@@ -392,6 +392,30 @@ static struct board_info __initdata boar
 		.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
 	},
 };
@ -12,7 +12,6 @@
 +	.has_pccard = 1,
 +	.has_pci = 1,
 +	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
 +
 +	.has_enet0 = 1,
 +	.enet0 = {
@ -32,7 +31,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 
 /*
-@@ -615,6 +640,7 @@ static const struct board_info __initcon
+@@ -615,6 +639,7 @@ static const struct board_info __initcon
 	&board_rta1025w_16,
 	&board_96348_D4PW,
 	&board_spw500v,
@ -40,7 +39,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -658,6 +684,7 @@ static struct of_device_id const bcm963x
+@@ -658,6 +683,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
 	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
 	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },
--- a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch
+++ b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -607,6 +607,31 @@ static struct board_info __initdata boar
+@@ -606,6 +606,31 @@ static struct board_info __initdata boar
 		.force_duplex_full = 1,
 	},
 };
@ -32,7 +32,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 
 /*
-@@ -651,6 +676,7 @@ static const struct board_info __initcon
+@@ -650,6 +675,7 @@ static const struct board_info __initcon
 	&board_dsl_274xb_rev_c,
 	&board_nb4_ser_r0,
 	&board_nb4_fxc_r1,
@ -40,7 +40,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 };
 
-@@ -694,6 +720,7 @@ static struct of_device_id const bcm963x
+@@ -693,6 +719,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
 	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
 	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
--- a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch
+++ b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch
@ -20,7 +20,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6338 */
 
 /*
-@@ -648,6 +661,7 @@ static const struct board_info __initcon
+@@ -647,6 +660,7 @@ static const struct board_info __initcon
 	&board_96338gw,
 	&board_96338w,
 	&board_96338w2_e7t,
@ -28,7 +28,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6338 */
 #ifdef CONFIG_BCM63XX_CPU_6345
 	&board_96345gw2,
-@@ -691,6 +705,7 @@ static struct of_device_id const bcm963x
+@@ -690,6 +704,7 @@ static struct of_device_id const bcm963x
 #ifdef CONFIG_BCM63XX_CPU_6338
 	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
 	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },
--- a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch
+++ b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -645,6 +645,20 @@ static struct board_info __initdata boar
+@@ -644,6 +644,20 @@ static struct board_info __initdata boar
 		.pci_dev = 1,
 	},
 };
@ -21,7 +21,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 
 /*
-@@ -691,6 +705,7 @@ static const struct board_info __initcon
+@@ -690,6 +704,7 @@ static const struct board_info __initcon
 	&board_nb4_ser_r0,
 	&board_nb4_fxc_r1,
 	&board_HW553,
@ -29,7 +29,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 };
 
-@@ -742,6 +757,7 @@ static struct of_device_id const bcm963x
+@@ -741,6 +756,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
 	{ .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, },
 	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
--- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
+++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -430,6 +430,27 @@ static struct board_info __initdata boar
+@@ -429,6 +429,27 @@ static struct board_info __initdata boar
 		.force_duplex_full = 1,
 	},
 };
@ -28,7 +28,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 
 /*
-@@ -694,6 +715,7 @@ static const struct board_info __initcon
+@@ -693,6 +714,7 @@ static const struct board_info __initcon
 	&board_96348_D4PW,
 	&board_spw500v,
 	&board_96348sv,
@ -36,7 +36,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -732,6 +754,7 @@ static struct of_device_id const bcm963x
+@@ -731,6 +753,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
 	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
 	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@ -44,7 +44,7 @@
 	{ .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
 	{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
 	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -791,6 +814,22 @@ void __init board_bcm963xx_init(void)
+@@ -790,6 +813,22 @@ void __init board_bcm963xx_init(void)
 		val &= MPI_CSBASE_BASE_MASK;
 	}
 	boot_addr = (u8 *)KSEG1ADDR(val);
--- a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch
+++ b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch
@ -23,7 +23,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -716,6 +732,7 @@ static const struct board_info __initcon
+@@ -715,6 +731,7 @@ static const struct board_info __initcon
 	&board_spw500v,
 	&board_96348sv,
 	&board_V2500V_BB,
@ -31,7 +31,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -754,6 +771,7 @@ static struct of_device_id const bcm963x
+@@ -753,6 +770,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
 	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
 	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
--- a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch
+++ b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -222,6 +222,31 @@ static struct board_info __initdata boar
+@@ -222,6 +222,30 @@ static struct board_info __initdata boar
 	},
 };
 
@ -11,7 +11,6 @@
 +	.has_pccard = 1,
 +	.has_pci = 1,
 +	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
 +
 +	.has_enet1 = 1,
 +	.enet1 = {
@ -32,7 +31,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -733,6 +758,7 @@ static const struct board_info __initcon
+@@ -732,6 +756,7 @@ static const struct board_info __initcon
 	&board_96348sv,
 	&board_V2500V_BB,
 	&board_V2110,
@ -40,7 +39,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -773,6 +799,8 @@ static struct of_device_id const bcm963x
+@@ -772,6 +797,8 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
 	{ .compatible = "bt,voyager-2110", .data = &board_V2110, },
 	{ .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, },
--- a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch
+++ b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -615,6 +615,7 @@ static struct board_info __initdata boar
+@@ -613,6 +613,7 @@ static struct board_info __initdata boar
 	},
 
 	.has_ohci0			= 1,
--- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
+++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -247,6 +247,29 @@ static struct board_info __initdata boar
+@@ -246,6 +246,29 @@ static struct board_info __initdata boar
 	},
 };
 
@ -30,7 +30,7 @@
 static struct board_info __initdata board_96348gw = {
 	.name				= "96348GW",
 	.expected_cpu_id		= 0x6348,
-@@ -760,6 +783,7 @@ static const struct board_info __initcon
+@@ -758,6 +781,7 @@ static const struct board_info __initcon
 	&board_V2500V_BB,
 	&board_V2110,
 	&board_ct536_ct5621,
@ -38,7 +38,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -801,6 +825,7 @@ static struct of_device_id const bcm963x
+@@ -799,6 +823,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "bt,voyager-2110", .data = &board_V2110, },
 	{ .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, },
 	{ .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, },
--- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
+++ b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
@ -35,7 +35,7 @@
 static struct board_info __initdata board_ct536_ct5621 = {
 	.name = "CT536_CT5621",
 	.expected_cpu_id = 0x6348,
-@@ -784,6 +812,7 @@ static const struct board_info __initcon
+@@ -782,6 +810,7 @@ static const struct board_info __initcon
 	&board_V2110,
 	&board_ct536_ct5621,
 	&board_96348A_122,
@ -43,7 +43,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -835,6 +864,7 @@ static struct of_device_id const bcm963x
+@@ -833,6 +862,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
 	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
 	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },
--- a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/bcm63xx/patches-5.4/518-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
-@@ -776,6 +776,52 @@ static struct board_info __initdata boar
+@@ -774,6 +774,52 @@ static struct board_info __initdata boar
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 
 /*
@ -63,7 +63,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  * all boards
  */
 static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -826,6 +872,9 @@ static const struct board_info __initcon
+@@ -824,6 +870,9 @@ static const struct board_info __initcon
 	&board_HW553,
 	&board_spw303v,
 #endif /* CONFIG_BCM63XX_CPU_6358 */
@ -73,7 +73,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 };
 
 static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -886,6 +935,7 @@ static struct of_device_id const bcm963x
+@@ -884,6 +933,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6368
--- a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/bcm63xx/patches-5.4/519-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
-@@ -819,6 +819,41 @@ static struct board_info __initdata boar
+@@ -817,6 +817,41 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -51,7 +51,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 
 /*
-@@ -874,6 +909,7 @@ static const struct board_info __initcon
+@@ -872,6 +907,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
@ -59,7 +59,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 };
 
-@@ -935,6 +971,7 @@ static struct of_device_id const bcm963x
+@@ -933,6 +969,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6368
--- a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@ -49,7 +49,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 
 /*
-@@ -891,6 +924,7 @@ static const struct board_info __initcon
+@@ -889,6 +922,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_3368 */
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
@ -57,7 +57,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 #ifdef CONFIG_BCM63XX_CPU_6338
 	&board_96338gw,
-@@ -945,6 +979,7 @@ static struct of_device_id const bcm963x
+@@ -943,6 +977,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6328
--- a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch
+++ b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch
@ -61,7 +61,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 
 /*
-@@ -925,6 +969,7 @@ static const struct board_info __initcon
+@@ -923,6 +967,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
 	&board_963281TAN,
@ -69,7 +69,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 #ifdef CONFIG_BCM63XX_CPU_6338
 	&board_96338gw,
-@@ -981,6 +1026,7 @@ static struct of_device_id const bcm963x
+@@ -979,6 +1024,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, },
--- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
+++ b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -556,6 +556,23 @@ static struct board_info __initdata boar
+@@ -555,6 +555,23 @@ static struct board_info __initdata boar
 	.has_ohci0 = 1,
 };
 
@ -24,7 +24,7 @@
 static struct board_info __initdata board_96348_D4PW = {
 	.name = "D-4P-W",
 	.expected_cpu_id = 0x6348,
-@@ -999,6 +1016,7 @@ static const struct board_info __initcon
+@@ -997,6 +1014,7 @@ static const struct board_info __initcon
 	&board_ct536_ct5621,
 	&board_96348A_122,
 	&board_CPVA502plus,
@ -32,7 +32,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -1052,6 +1070,7 @@ static struct of_device_id const bcm963x
+@@ -1050,6 +1068,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
 	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
 	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
--- a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch
+++ b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -855,6 +855,30 @@ static struct board_info __initdata boar
+@@ -853,6 +853,30 @@ static struct board_info __initdata boar
 	},
 };
 
@ -31,7 +31,7 @@
 static struct board_info __initdata board_HW553 = {
 	.name = "HW553",
 	.expected_cpu_id = 0x6358,
-@@ -1027,6 +1051,7 @@ static const struct board_info __initcon
+@@ -1025,6 +1049,7 @@ static const struct board_info __initcon
 	&board_dsl_274xb_rev_c,
 	&board_nb4_ser_r0,
 	&board_nb4_fxc_r1,
@ -39,7 +39,7 @@
 	&board_HW553,
 	&board_spw303v,
 #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -1084,6 +1109,7 @@ static struct of_device_id const bcm963x
+@@ -1082,6 +1107,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, },
--- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/bcm63xx/patches-5.4/525-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
-@@ -917,6 +917,31 @@ static struct board_info __initdata boar
+@@ -915,6 +915,31 @@ static struct board_info __initdata boar
 		.use_internal_phy = 1,
 	},
 };
@ -32,7 +32,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 
 /*
-@@ -1054,6 +1079,7 @@ static const struct board_info __initcon
+@@ -1052,6 +1077,7 @@ static const struct board_info __initcon
 	&board_ct6373_1,
 	&board_HW553,
 	&board_spw303v,
@ -40,7 +40,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
-@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x
+@@ -1110,6 +1136,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, },
--- a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch
+++ b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -944,6 +944,31 @@ static struct board_info __initdata boar
+@@ -942,6 +942,31 @@ static struct board_info __initdata boar
 };
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 
@ -32,7 +32,7 @@
 /*
  * known 6368 boards
  */
-@@ -1081,6 +1106,9 @@ static const struct board_info __initcon
+@@ -1079,6 +1104,9 @@ static const struct board_info __initcon
 	&board_spw303v,
 	&board_DVAG3810BN,
 #endif /* CONFIG_BCM63XX_CPU_6358 */
@ -42,7 +42,7 @@
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
 	&board_96368mvngr,
-@@ -1149,6 +1177,9 @@ static struct of_device_id const bcm963x
+@@ -1147,6 +1175,9 @@ static struct of_device_id const bcm963x
 	{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
 #endif
--- a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch
+++ b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -490,6 +490,22 @@ static struct board_info __initdata boar
+@@ -489,6 +489,22 @@ static struct board_info __initdata boar
 	.has_ehci0			= 1,
 };
 
@ -23,7 +23,7 @@
 static struct board_info __initdata board_rta1025w_16 = {
 	.name				= "RTA1025W_16",
 	.expected_cpu_id		= 0x6348,
-@@ -1079,6 +1095,7 @@ static const struct board_info __initcon
+@@ -1077,6 +1093,7 @@ static const struct board_info __initcon
 	&board_96348gw_10,
 	&board_96348gw_11,
 	&board_FAST2404,
@ -31,7 +31,7 @@
 	&board_DV201AMR,
 	&board_96348gw_a,
 	&board_rta1025w_16,
-@@ -1151,6 +1168,7 @@ static struct of_device_id const bcm963x
+@@ -1149,6 +1166,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
  	{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
 	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },
--- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
+++ b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
@ -50,7 +50,7 @@
 static struct board_info __initdata board_dsl_274xb_f1 = {
 	.name = "AW4339U",
 	.expected_cpu_id = 0x6328,
-@@ -1076,6 +1119,7 @@ static const struct board_info __initcon
+@@ -1074,6 +1117,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 /* CONFIG_BCM63XX_CPU_6328 */
 #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1138,6 +1182,7 @@ static struct of_device_id const bcm963x
+@@ -1136,6 +1180,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6328
--- a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch
+++ b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch
@ -79,7 +79,7 @@
 static struct board_info __initdata board_963281TAN = {
 	.name = "963281TAN",
 	.expected_cpu_id = 0x6328,
-@@ -1118,6 +1190,7 @@ static const struct board_info __initcon
+@@ -1116,6 +1188,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_3368 */
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
@ -87,7 +87,7 @@
 	&board_963281TAN,
 	&board_A4001N1,
 	&board_dsl_274xb_f1,
-@@ -1185,6 +1258,7 @@ static struct of_device_id const bcm963x
+@@ -1183,6 +1256,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, },
--- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
+++ b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
@ -61,7 +61,7 @@
 static struct sprom_fixup __initdata ar5387un_fixups[] = {
 	{ .offset = 2, .value = 0x05bb },
 	{ .offset = 65, .value = 0x1204 },
-@@ -1190,6 +1244,7 @@ static const struct board_info __initcon
+@@ -1188,6 +1242,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_3368 */
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
@ -69,7 +69,7 @@
 	&board_AR5387un,
 	&board_963281TAN,
 	&board_A4001N1,
-@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x
+@@ -1256,6 +1311,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, },
--- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch
+++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch
@ -20,7 +20,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6345 */
 
 /*
-@@ -1258,6 +1271,7 @@ static const struct board_info __initcon
+@@ -1256,6 +1269,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_6338 */
 #ifdef CONFIG_BCM63XX_CPU_6345
 	&board_96345gw2,
@ -28,7 +28,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6345 */
 #ifdef CONFIG_BCM63XX_CPU_6348
 	&board_96348r,
-@@ -1325,6 +1339,7 @@ static struct of_device_id const bcm963x
+@@ -1323,6 +1337,7 @@ static struct of_device_id const bcm963x
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6345
 	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
--- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch
+++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch
@ -8,7 +8,7 @@
 #include <asm/addrspace.h>
 #include <bcm63xx_board.h>
 #include <bcm63xx_cpu.h>
-@@ -1102,6 +1103,94 @@ static struct board_info __initdata boar
+@@ -1100,6 +1101,94 @@ static struct board_info __initdata boar
 	},
 };
 
@ -103,7 +103,7 @@
  /* T-Home Speedport W 303V Typ B */
 static struct board_info __initdata board_spw303v = {
 	.name = "96358-502V",
-@@ -1306,6 +1395,9 @@ static const struct board_info __initcon
+@@ -1304,6 +1393,9 @@ static const struct board_info __initcon
 	&board_nb4_fxc_r1,
 	&board_ct6373_1,
 	&board_HW553,
@ -113,7 +113,7 @@
 	&board_spw303v,
 	&board_DVAG3810BN,
 #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -1376,6 +1468,9 @@ static struct of_device_id const bcm963x
+@@ -1374,6 +1466,9 @@ static struct of_device_id const bcm963x
 	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
 	{ .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, },
 	{ .compatible = "huawei,echolife-hg553", .data = &board_HW553, },
--- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
+++ b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
@ -25,7 +25,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6345 */
 
 /*
-@@ -1361,6 +1379,7 @@ static const struct board_info __initcon
+@@ -1359,6 +1377,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6345
 	&board_96345gw2,
 	&board_rta770bw,
@ -33,7 +33,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6345 */
 #ifdef CONFIG_BCM63XX_CPU_6348
 	&board_96348r,
-@@ -1432,6 +1451,7 @@ static struct of_device_id const bcm963x
+@@ -1430,6 +1449,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, },
--- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch
+++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch
@ -55,7 +55,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 
 /*
-@@ -1369,6 +1405,7 @@ static const struct board_info __initcon
+@@ -1367,6 +1403,7 @@ static const struct board_info __initcon
 	&board_963281TAN,
 	&board_A4001N1,
 	&board_dsl_274xb_f1,
@ -63,7 +63,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 #ifdef CONFIG_BCM63XX_CPU_6338
 	&board_96338gw,
-@@ -1441,6 +1478,7 @@ static struct of_device_id const bcm963x
+@@ -1439,6 +1476,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
 	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
 	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
--- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch
+++ b/target/linux/bcm63xx/patches-5.4/535-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
-@@ -1308,6 +1308,37 @@ static struct board_info __initdata boar
+@@ -1306,6 +1306,37 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -44,7 +44,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 #endif /* CONFIG_BCM63XX_CPU_6362 */
 
 /*
-@@ -1459,6 +1490,7 @@ static const struct board_info __initcon
+@@ -1457,6 +1488,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_6358 */
 #ifdef CONFIG_BCM63XX_CPU_6362
 	&board_nb6,
@ -52,7 +52,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 #endif /* CONFIG_BCM63XX_CPU_6362 */
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
-@@ -1539,6 +1571,7 @@ static struct of_device_id const bcm963x
+@@ -1537,6 +1569,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6362
--- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch
+++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch
@ -53,7 +53,7 @@
  * known 6328 boards
  */
 #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1429,6 +1475,9 @@ static const struct board_info __initcon
+@@ -1427,6 +1473,9 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_3368
 	&board_cvg834g,
 #endif /* CONFIG_BCM63XX_CPU_3368 */
@ -63,7 +63,7 @@
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
 	&board_AR5381u,
-@@ -1503,6 +1552,9 @@ static struct of_device_id const bcm963x
+@@ -1501,6 +1550,9 @@ static struct of_device_id const bcm963x
 #ifdef CONFIG_BCM63XX_CPU_3368
 	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
 #endif
--- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch
+++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch
@ -48,7 +48,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6318 */
 
 /*
-@@ -1477,6 +1518,7 @@ static const struct board_info __initcon
+@@ -1475,6 +1516,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_3368 */
 #ifdef CONFIG_BCM63XX_CPU_6318
 	&board_96318ref,
@ -56,7 +56,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6318 */
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
-@@ -1554,6 +1596,7 @@ static struct of_device_id const bcm963x
+@@ -1552,6 +1594,7 @@ static struct of_device_id const bcm963x
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6318
 	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
--- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch
+++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1510,6 +1510,45 @@ static struct board_info __initdata boar
+@@ -1508,6 +1508,45 @@ static struct board_info __initdata boar
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 
 /*
@ -46,7 +46,7 @@
  * all boards
  */
 static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1587,6 +1626,9 @@ static const struct board_info __initcon
+@@ -1585,6 +1624,9 @@ static const struct board_info __initcon
 	&board_96368mvwg,
 	&board_96368mvngr,
 #endif /* CONFIG_BCM63XX_CPU_6368 */
@ -56,7 +56,7 @@
 };
 
 static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1674,6 +1716,7 @@ static struct of_device_id const bcm963x
+@@ -1672,6 +1714,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_63268
--- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch
+++ b/target/linux/bcm63xx/patches-5.4/539-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 = {
 	.name = "V2110",
-@@ -1600,6 +1615,7 @@ static const struct board_info __initcon
+@@ -1598,6 +1613,7 @@ static const struct board_info __initcon
 	&board_96348A_122,
 	&board_CPVA502plus,
 	&board_96348W3,
@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 #endif /* CONFIG_BCM63XX_CPU_6348 */
 #ifdef CONFIG_BCM63XX_CPU_6358
 	&board_96358vw,
-@@ -1661,6 +1677,7 @@ static struct of_device_id const bcm963x
+@@ -1659,6 +1675,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6348
--- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
+++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1561,6 +1561,48 @@ static struct board_info __initdata boar
+@@ -1559,6 +1559,48 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -49,7 +49,7 @@
 #endif /* CONFIG_BCM63XX_CPU_63268 */
 
 /*
-@@ -1644,6 +1686,7 @@ static const struct board_info __initcon
+@@ -1642,6 +1684,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 #ifdef CONFIG_BCM63XX_CPU_63268
 	&board_963269bhr,
@ -57,7 +57,7 @@
 #endif /* CONFIG_BCM63XX_CPU_63268 */
 };
 
-@@ -1734,6 +1777,7 @@ static struct of_device_id const bcm963x
+@@ -1732,6 +1775,7 @@ static struct of_device_id const bcm963x
 #endif
 #ifdef CONFIG_BCM63XX_CPU_63268
 	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
--- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
+++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar
+@@ -1526,6 +1526,65 @@ static struct board_info __initdata boar
  * known 63268/63269 boards
  */
 #ifdef CONFIG_BCM63XX_CPU_63268
@ -66,7 +66,7 @@
 static struct board_info __initdata board_963269bhr = {
 	.name = "963269BHR",
 	.expected_cpu_id = 0x63268,
-@@ -1685,6 +1744,7 @@ static const struct board_info __initcon
+@@ -1683,6 +1742,7 @@ static const struct board_info __initcon
 	&board_96368mvngr,
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 #ifdef CONFIG_BCM63XX_CPU_63268
@ -74,7 +74,7 @@
 	&board_963269bhr,
 	&board_vw6339gu,
 #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -1776,6 +1836,7 @@ static struct of_device_id const bcm963x
+@@ -1774,6 +1834,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_63268
--- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
+++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
@ -9,7 +9,7 @@
 #include <asm/addrspace.h>
 #include <bcm63xx_board.h>
 #include <bcm63xx_cpu.h>
-@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar
+@@ -1520,6 +1522,47 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -57,7 +57,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 
 /*
-@@ -1742,6 +1785,7 @@ static const struct board_info __initcon
+@@ -1740,6 +1783,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
 	&board_96368mvngr,
@ -65,7 +65,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 #ifdef CONFIG_BCM63XX_CPU_63268
 	&board_963268bu_p300,
-@@ -1834,6 +1878,7 @@ static struct of_device_id const bcm963x
+@@ -1832,6 +1876,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, },
--- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch
+++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar
+@@ -1523,6 +1523,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 },
-@@ -1785,6 +1838,7 @@ static const struct board_info __initcon
+@@ -1783,6 +1836,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
 	&board_96368mvngr,
@ -68,7 +68,7 @@
 	&board_WAP5813n,
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1878,6 +1932,7 @@ static struct of_device_id const bcm963x
+@@ -1876,6 +1930,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, },
--- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
+++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar
+@@ -1576,6 +1576,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 },
-@@ -1839,6 +1892,7 @@ static const struct board_info __initcon
+@@ -1837,6 +1890,7 @@ static const struct board_info __initcon
 	&board_96368mvwg,
 	&board_96368mvngr,
 	&board_VR3025u,
@ -68,7 +68,7 @@
 	&board_WAP5813n,
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1933,6 +1987,7 @@ static struct of_device_id const bcm963x
+@@ -1931,6 +1985,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, },
--- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/545-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
-@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1532,6 +1532,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,
-@@ -1891,6 +1933,7 @@ static const struct board_info __initcon
+@@ -1889,6 +1931,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,
-@@ -1989,6 +2032,7 @@ static struct of_device_id const bcm963x
+@@ -1987,6 +2030,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, },
--- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch
+++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar
+@@ -1234,6 +1234,36 @@ static struct board_info __initdata boar
 	},
 };
 
@ -37,7 +37,7 @@
 static struct board_info __initdata board_HW553 = {
 	.name = "HW553",
 	.expected_cpu_id = 0x6358,
-@@ -1919,6 +1949,7 @@ static const struct board_info __initcon
+@@ -1917,6 +1947,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,
-@@ -2009,6 +2040,7 @@ static struct of_device_id const bcm963x
+@@ -2007,6 +2038,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, },
--- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
+++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
@ -50,7 +50,7 @@
 static struct board_info __initdata board_A4001N1 = {
 	.name = "963281T_TEF",
 	.expected_cpu_id = 0x6328,
-@@ -1901,6 +1944,7 @@ static const struct board_info __initcon
+@@ -1899,6 +1942,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,
-@@ -1986,6 +2030,7 @@ static struct of_device_id const bcm963x
+@@ -1984,6 +2028,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6328
--- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch
+++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch
@ -73,7 +73,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6318 */
 
 /*
-@@ -1938,6 +2004,7 @@ static const struct board_info __initcon
+@@ -1936,6 +2002,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6318
 	&board_96318ref,
 	&board_96318ref_p300,
@ -81,7 +81,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6318 */
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
-@@ -2028,6 +2095,7 @@ static struct of_device_id const bcm963x
+@@ -2026,6 +2093,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, },
--- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch
+++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar
+@@ -1662,6 +1662,30 @@ static struct board_info __initdata boar
 	},
 };
 
@ -31,7 +31,7 @@
 static struct sprom_fixup __initdata vr3025u_fixups[] = {
 	{ .offset = 97, .value = 0xfeb3 },
 	{ .offset = 98, .value = 0x1618 },
-@@ -2075,6 +2099,7 @@ static const struct board_info __initcon
+@@ -2073,6 +2097,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,
-@@ -2177,6 +2202,7 @@ static struct of_device_id const bcm963x
+@@ -2175,6 +2200,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, },
--- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch
+++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar
+@@ -1343,6 +1343,31 @@ static struct board_info __initdata boar
 	},
 };
 
@ -32,7 +32,7 @@
 static struct board_info __initdata board_HW520 = {
 	.name = "HW6358GW_B",
 	.expected_cpu_id = 0x6358,
-@@ -2084,6 +2109,7 @@ static const struct board_info __initcon
+@@ -2082,6 +2107,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,
-@@ -2191,6 +2217,7 @@ static struct of_device_id const bcm963x
+@@ -2189,6 +2215,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
 	{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
--- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch
+++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar
+@@ -1711,6 +1711,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 },
-@@ -2126,6 +2172,7 @@ static const struct board_info __initcon
+@@ -2124,6 +2170,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,
-@@ -2229,6 +2276,7 @@ static struct of_device_id const bcm963x
+@@ -2227,6 +2274,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, },
--- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
+++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
@ -45,7 +45,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6318 */
 
 /*
-@@ -2100,6 +2138,7 @@ static const struct board_info __initcon
+@@ -2098,6 +2136,7 @@ static const struct board_info __initcon
 	&board_96318ref,
 	&board_96318ref_p300,
 	&board_dsl_2751b_d1,
@ -53,7 +53,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6318 */
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
-@@ -2194,6 +2233,7 @@ static struct of_device_id const bcm963x
+@@ -2192,6 +2231,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
 	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
 	{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },
--- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
+++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar
+@@ -1943,6 +1943,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 },
-@@ -2215,6 +2268,7 @@ static const struct board_info __initcon
+@@ -2213,6 +2266,7 @@ static const struct board_info __initcon
 	&board_P870HW51A_V2,
 	&board_VR3025u,
 	&board_VR3025un,
@ -68,7 +68,7 @@
 	&board_WAP5813n,
 #endif /* CONFIG_BCM63XX_CPU_6368 */
 #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2315,6 +2369,7 @@ static struct of_device_id const bcm963x
+@@ -2313,6 +2367,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, },
--- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
+++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
@ -51,7 +51,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 
 /*
-@@ -2202,6 +2246,7 @@ static const struct board_info __initcon
+@@ -2200,6 +2244,7 @@ static const struct board_info __initcon
 	&board_A4001N1,
 	&board_dsl_274xb_f1,
 	&board_FAST2704V2,
@ -59,7 +59,7 @@
 #endif /* CONFIG_BCM63XX_CPU_6328 */
 #ifdef CONFIG_BCM63XX_CPU_6338
 	&board_96338gw,
-@@ -2297,6 +2342,7 @@ static struct of_device_id const bcm963x
+@@ -2295,6 +2340,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
 	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
 	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
--- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
+++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar
+@@ -1839,6 +1839,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 },
-@@ -2309,6 +2355,7 @@ static const struct board_info __initcon
+@@ -2307,6 +2353,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,
-@@ -2417,6 +2464,7 @@ static struct of_device_id const bcm963x
+@@ -2415,6 +2462,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, },
--- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch
+++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar
+@@ -1793,6 +1793,43 @@ static struct board_info __initdata boar
 	},
 };
 
@ -44,7 +44,7 @@
 static struct board_info __initdata board_HG655b = {
 	.name = "HW65x",
 	.expected_cpu_id = 0x6368,
-@@ -2355,6 +2392,7 @@ static const struct board_info __initcon
+@@ -2353,6 +2390,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,
-@@ -2467,6 +2505,7 @@ static struct of_device_id const bcm963x
+@@ -2465,6 +2503,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "huawei,echolife-hg622", .data = &board_HG622, },
 	{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
 	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
--- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
+++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar
+@@ -1693,6 +1693,48 @@ static struct board_info __initdata boar
  * known 6368 boards
  */
 #ifdef CONFIG_BCM63XX_CPU_6368
@ -49,7 +49,7 @@
 static struct board_info __initdata board_96368mvwg = {
 	.name = "96368MVWG",
 	.expected_cpu_id = 0x6368,
-@@ -2389,6 +2431,7 @@ static const struct board_info __initcon
+@@ -2387,6 +2429,7 @@ static const struct board_info __initcon
 	&board_fast2504n,
 #endif /* CONFIG_BCM63XX_CPU_6362 */
 #ifdef CONFIG_BCM63XX_CPU_6368
@ -57,7 +57,7 @@
 	&board_96368mvwg,
 	&board_96368mvngr,
 	&board_DGND3700v1_3800B,
-@@ -2496,6 +2539,7 @@ static struct of_device_id const bcm963x
+@@ -2494,6 +2537,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6368
--- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
+++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar
+@@ -2165,6 +2165,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 },
-@@ -2439,6 +2539,7 @@ static const struct board_info __initcon
+@@ -2437,6 +2537,7 @@ static const struct board_info __initcon
 	&board_HG622,
 	&board_HG655b,
 	&board_P870HW51A_V2,
@ -115,7 +115,7 @@
 	&board_VR3025u,
 	&board_VR3025un,
 	&board_VR3026e,
-@@ -2550,6 +2651,7 @@ static struct of_device_id const bcm963x
+@@ -2548,6 +2649,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
 	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
 	{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },
--- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
+++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar
+@@ -2015,6 +2015,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,
-@@ -2539,6 +2562,7 @@ static const struct board_info __initcon
+@@ -2537,6 +2560,7 @@ static const struct board_info __initcon
 	&board_HG622,
 	&board_HG655b,
 	&board_P870HW51A_V2,
@ -38,7 +38,7 @@
 	&board_VH4032N,
 	&board_VR3025u,
 	&board_VR3025un,
-@@ -2640,6 +2664,7 @@ static struct of_device_id const bcm963x
+@@ -2638,6 +2662,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_6368
--- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch
+++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch
@ -66,7 +66,7 @@
 static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
 	{ .offset = 96, .value = 0x2046 },
 	{ .offset = 97, .value = 0xfe9d },
-@@ -2482,6 +2541,7 @@ static const struct board_info __initcon
+@@ -2480,6 +2539,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6318
 	&board_96318ref,
 	&board_96318ref_p300,
@ -74,7 +74,7 @@
 	&board_dsl_2751b_d1,
 	&board_FAST2704N,
 #endif /* CONFIG_BCM63XX_CPU_6318 */
-@@ -2584,6 +2644,7 @@ static struct of_device_id const bcm963x
+@@ -2582,6 +2642,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, },
--- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
+++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
@ -72,7 +72,7 @@
 static struct sprom_fixup __initdata ar5381u_fixups[] = {
 	{ .offset = 97, .value = 0xfee5 },
 	{ .offset = 98, .value = 0x157c },
-@@ -2547,6 +2612,7 @@ static const struct board_info __initcon
+@@ -2545,6 +2610,7 @@ static const struct board_info __initcon
 #endif /* CONFIG_BCM63XX_CPU_6318 */
 #ifdef CONFIG_BCM63XX_CPU_6328
 	&board_96328avng,
@ -80,7 +80,7 @@
 	&board_AR5381u,
 	&board_AR5387un,
 	&board_963281TAN,
-@@ -2658,6 +2724,8 @@ static struct of_device_id const bcm963x
+@@ -2656,6 +2722,8 @@ static struct of_device_id const bcm963x
 	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
 	{ .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, },
 	{ .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, },
--- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch
+++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2594,6 +2594,42 @@ static struct board_info __initdata boar
+@@ -2592,6 +2592,42 @@ static struct board_info __initdata boar
 		},
 	},
 };
@ -43,7 +43,7 @@
 #endif /* CONFIG_BCM63XX_CPU_63268 */
 
 /*
-@@ -2699,6 +2735,7 @@ static const struct board_info __initcon
+@@ -2697,6 +2733,7 @@ static const struct board_info __initcon
 	&board_963268bu_p300,
 	&board_963269bhr,
 	&board_vw6339gu,
@ -51,7 +51,7 @@
 #endif /* CONFIG_BCM63XX_CPU_63268 */
 };
 
-@@ -2812,6 +2849,7 @@ static struct of_device_id const bcm963x
+@@ -2810,6 +2847,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, },
--- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
+++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c