From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Fri, 7 Aug 2020 08:22:44 +0000 (+0200)
Subject: bcm63xx: add missing fallback SPROMs
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=eddf8636504466c7e43497a1a59e4bc59dfdb8a7;p=openwrt%2Fstaging%2Fthess.git

bcm63xx: add missing fallback SPROMs

A couple of SPROM IDs are missing.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
index 1d83831329..e7b6a21fb2 100644
--- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
+++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -204,6 +204,44 @@ static struct board_info __initdata boar
+@@ -204,6 +204,49 @@ static struct board_info __initdata boar
  		.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
  	},
  };
@@ -41,11 +41,16 @@
 +	},
 +
 +	.use_fallback_sprom = 1,
++	.fallback_sprom = {
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2101,6 +2139,7 @@ static const struct board_info __initcon
+@@ -2101,6 +2144,7 @@ static const struct board_info __initcon
  	&board_96318ref,
  	&board_96318ref_p300,
  	&board_dsl_2751b_d1,
@@ -53,7 +58,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2195,6 +2234,7 @@ static struct of_device_id const bcm963x
+@@ -2195,6 +2239,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, },
diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
index 75500a550c..3753815585 100644
--- 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
+@@ -1950,6 +1950,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 },
-@@ -2216,6 +2269,7 @@ static const struct board_info __initcon
+@@ -2221,6 +2274,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
-@@ -2316,6 +2370,7 @@ static struct of_device_id const bcm963x
+@@ -2321,6 +2375,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/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
index 75ec8ec516..bf60aa0200 100644
--- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
+++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -612,6 +612,50 @@ static struct board_info __initdata boar
+@@ -617,6 +617,50 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -51,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2203,6 +2247,7 @@ static const struct board_info __initcon
+@@ -2208,6 +2252,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,
-@@ -2298,6 +2343,7 @@ static struct of_device_id const bcm963x
+@@ -2303,6 +2348,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, },
diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
index 54484bfaff..c279210f2d 100644
--- 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
+@@ -1846,6 +1846,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 },
-@@ -2310,6 +2356,7 @@ static const struct board_info __initcon
+@@ -2315,6 +2361,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,
-@@ -2418,6 +2465,7 @@ static struct of_device_id const bcm963x
+@@ -2423,6 +2470,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/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch
index 485da4d66c..51e6faf09b 100644
--- 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
+@@ -1800,6 +1800,43 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -44,7 +44,7 @@
  static struct board_info __initdata board_HG655b = {
  	.name = "HW65x",
  	.expected_cpu_id = 0x6368,
-@@ -2356,6 +2393,7 @@ static const struct board_info __initcon
+@@ -2361,6 +2398,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,
-@@ -2468,6 +2506,7 @@ static struct of_device_id const bcm963x
+@@ -2473,6 +2511,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, },
diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
index 70edc9e002..e8e891be99 100644
--- 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
+@@ -1700,6 +1700,49 @@ static struct board_info __initdata boar
   * known 6368 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -41,6 +41,7 @@
 +
 +	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
++		.type = SPROM_BCM4322,
 +		.pci_bus = 0,
 +		.pci_dev = 1,
 +	},
@@ -49,7 +50,7 @@
  static struct board_info __initdata board_96368mvwg = {
  	.name = "96368MVWG",
  	.expected_cpu_id = 0x6368,
-@@ -2390,6 +2432,7 @@ static const struct board_info __initcon
+@@ -2395,6 +2438,7 @@ static const struct board_info __initcon
  	&board_fast2504n,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -57,7 +58,7 @@
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
-@@ -2497,6 +2540,7 @@ static struct of_device_id const bcm963x
+@@ -2502,6 +2546,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
index 56f8498289..19f9ef73f7 100644
--- 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
+@@ -2173,6 +2173,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 },
-@@ -2440,6 +2540,7 @@ static const struct board_info __initcon
+@@ -2446,6 +2546,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -115,7 +115,7 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_VR3026e,
-@@ -2551,6 +2652,7 @@ static struct of_device_id const bcm963x
+@@ -2557,6 +2658,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, },
diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
index 9e40de2002..ae1a748ae7 100644
--- 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
+@@ -2023,6 +2023,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,
-@@ -2540,6 +2563,7 @@ static const struct board_info __initcon
+@@ -2546,6 +2569,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -38,7 +38,7 @@
  	&board_VH4032N,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2641,6 +2665,7 @@ static struct of_device_id const bcm963x
+@@ -2647,6 +2671,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch
index 43b8c38dc0..640ee59ec3 100644
--- 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 },
-@@ -2483,6 +2542,7 @@ static const struct board_info __initcon
+@@ -2489,6 +2548,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 */
-@@ -2585,6 +2645,7 @@ static struct of_device_id const bcm963x
+@@ -2591,6 +2651,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/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
index 4e387c1d7d..28a0a7b468 100644
--- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
+++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -347,6 +347,71 @@ static struct board_info __initdata boar
+@@ -352,6 +352,71 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -72,7 +72,7 @@
  static struct sprom_fixup __initdata ar5381u_fixups[] = {
  	{ .offset = 97, .value = 0xfee5 },
  	{ .offset = 98, .value = 0x157c },
-@@ -2548,6 +2613,7 @@ static const struct board_info __initcon
+@@ -2554,6 +2619,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,
-@@ -2659,6 +2725,8 @@ static struct of_device_id const bcm963x
+@@ -2665,6 +2731,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, },
diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch
index 5b3cd50ea6..6c9a05c9d8 100644
--- 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
-@@ -2595,6 +2595,42 @@ static struct board_info __initdata boar
+@@ -2601,6 +2601,42 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -43,7 +43,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2700,6 +2736,7 @@ static const struct board_info __initcon
+@@ -2706,6 +2742,7 @@ static const struct board_info __initcon
  	&board_963268bu_p300,
  	&board_963269bhr,
  	&board_vw6339gu,
@@ -51,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -2813,6 +2850,7 @@ static struct of_device_id const bcm963x
+@@ -2819,6 +2856,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, },
diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
index 18dcd2a227..5df94067a9 100644
--- 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
-@@ -2554,6 +2554,41 @@ static struct board_info __initdata boar
+@@ -2560,6 +2560,41 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -42,7 +42,7 @@
  static struct board_info __initdata board_vw6339gu = {
  	.name = "VW6339GU",
  	.expected_cpu_id = 0x63268,
-@@ -2735,6 +2770,7 @@ static const struct board_info __initcon
+@@ -2741,6 +2776,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
  	&board_963269bhr,
@@ -50,7 +50,7 @@
  	&board_vw6339gu,
  	&board_BSKYB_63168,
  #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -2849,6 +2885,7 @@ static struct of_device_id const bcm963x
+@@ -2855,6 +2891,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
index 73d921eba4..74739baf9f 100644
--- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar
+@@ -1788,6 +1788,30 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -31,7 +31,7 @@
  static struct board_info __initdata board_fast2504n = {
  	.name = "F@ST2504n",
  	.expected_cpu_id = 0x6362,
-@@ -2749,6 +2773,7 @@ static const struct board_info __initcon
+@@ -2755,6 +2779,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
@@ -39,7 +39,7 @@
  	&board_fast2504n,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2863,6 +2888,7 @@ static struct of_device_id const bcm963x
+@@ -2869,6 +2894,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362
diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch
index 426c500068..0cf2fbb324 100644
--- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch
+++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2578,6 +2578,31 @@ static struct board_info __initdata boar
+@@ -2584,6 +2584,31 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -32,7 +32,7 @@
  static struct board_info __initdata board_VR3032u = {
  	.name = "963168M-1841N1",
  	.expected_cpu_id = 0x63268,
-@@ -2795,6 +2820,7 @@ static const struct board_info __initcon
+@@ -2801,6 +2826,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
  	&board_963269bhr,
@@ -40,7 +40,7 @@
  	&board_VR3032u,
  	&board_vw6339gu,
  	&board_BSKYB_63168,
-@@ -2911,6 +2937,7 @@ static struct of_device_id const bcm963x
+@@ -2917,6 +2943,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch
index 66d93ebdac..8fd559fdb9 100644
--- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar
+@@ -1842,6 +1842,37 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -38,7 +38,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -2800,6 +2831,7 @@ static const struct board_info __initcon
+@@ -2806,6 +2837,7 @@ static const struct board_info __initcon
  	&board_nb6,
  	&board_dgnd3700v2,
  	&board_fast2504n,
@@ -46,7 +46,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_AV4202N,
-@@ -2914,6 +2946,7 @@ static struct of_device_id const bcm963x
+@@ -2920,6 +2952,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362
diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch
index e03a3caf0c..04d70d59ac 100644
--- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch
+++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -614,6 +614,49 @@ static struct board_info __initdata boar
+@@ -619,6 +619,49 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -50,7 +50,7 @@
  static struct board_info __initdata board_A4001N1 = {
  	.name = "963281T_TEF",
  	.expected_cpu_id = 0x6328,
-@@ -2769,6 +2812,7 @@ static const struct board_info __initcon
+@@ -2775,6 +2818,7 @@ static const struct board_info __initcon
  	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N,
@@ -58,7 +58,7 @@
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
-@@ -2874,6 +2918,7 @@ static struct of_device_id const bcm963x
+@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch
index fded12372d..c719ef556a 100644
--- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch
+++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2789,6 +2789,36 @@ static struct board_info __initdata boar
+@@ -2795,6 +2795,36 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -37,7 +37,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2900,6 +2930,7 @@ static const struct board_info __initcon
+@@ -2906,6 +2936,7 @@ static const struct board_info __initcon
  	&board_VR3032u,
  	&board_vw6339gu,
  	&board_BSKYB_63168,
@@ -45,7 +45,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -3018,6 +3049,8 @@ static struct of_device_id const bcm963x
+@@ -3024,6 +3055,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vg-8050", .data = &board_VG8050, },
  	{ .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, },
  	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },