bcm63xx: refactor board patches

Current board patches format is crazy.
Let's try to put some order.

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

target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch

@@ -6,17 +6,17 @@
  };
 +
 +static struct board_info __initdata board_96348_D4PW = {
-+	.name				= "D-4P-W",
-+	.expected_cpu_id		= 0x6348,
++	.name = "D-4P-W",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */

target/linux/bcm63xx/patches-5.4/501-board-NB4.patch

@@ -1,67 +1,63 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -416,6 +416,60 @@ static struct board_info __initdata boar
+@@ -416,6 +416,56 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  };
 +
 +static struct board_info __initdata board_nb4_ser_r0 = {
-+	.name				= "NB4-SER-r0",
-+	.expected_cpu_id		= 0x6358,
++	.name = "NB4-SER-r0",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+
-+	.has_ohci0 = 1,
-+	.has_pccard = 1,
-+	.has_ehci0 = 1,
-+	.num_usbh_ports			= 2,
 +};
 +
 +static struct board_info __initdata board_nb4_fxc_r1 = {
-+	.name				= "NB4-FXC-r1",
-+	.expected_cpu_id		= 0x6358,
++	.name = "NB4-FXC-r1",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+
-+	.has_ohci0 = 1,
-+	.has_pccard = 1,
-+	.has_ehci0 = 1,
-+	.num_usbh_ports			= 2,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -451,6 +505,8 @@ static const struct board_info __initcon
+@@ -451,6 +501,8 @@ static const struct board_info __initcon
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
@@ -70,7 +66,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -492,6 +548,8 @@ static struct of_device_id const bcm963x
+@@ -492,6 +544,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,a226m", .data = &board_DWVS0, },
  	{ .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, },
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },

target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch

@@ -1,27 +1,26 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -98,6 +98,20 @@ static struct board_info __initdata boar
+@@ -98,6 +98,19 @@ static struct board_info __initdata boar
  		.force_duplex_full	= 1,
  	},
  };
 +
 +static struct board_info __initdata board_96338w2_e7t = {
-+	.name				= "96338W2_E7T",
-+	.expected_cpu_id		= 0x6338,
-+
-+	.has_enet0			= 1,
++	.name = "96338W2_E7T",
++	.expected_cpu_id = 0x6338,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -485,6 +499,7 @@ static const struct board_info __initcon
+@@ -481,6 +494,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
  	&board_96338w,
@@ -29,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -521,6 +536,7 @@ static struct of_device_id const bcm963x
+@@ -517,6 +531,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
  	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },

target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch

@@ -1,32 +1,30 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -383,6 +383,25 @@ static struct board_info __initdata boar
+@@ -382,6 +382,23 @@ static struct board_info __initdata boar
  	.num_usbh_ports			= 2,
  };
  
 +static struct board_info __initdata board_CPVA642 = {
-+	.name                           = "CPVA642",
-+	.expected_cpu_id                = 0x6358,
++	.name = "CPVA642",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet1                      = 1,
-+	.has_pci                        = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100        = 1,
-+		.force_duplex_full      = 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 + 	},
-+
-+	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
 +};
-+
 +
  static struct board_info __initdata board_AGPFS0 = {
  	.name				= "AGPF-S0",
  	.expected_cpu_id		= 0x6358,
-@@ -519,6 +538,7 @@ static const struct board_info __initcon
+@@ -514,6 +531,7 @@ static const struct board_info __initcon
  	&board_96358vw,
  	&board_96358vw2,
  	&board_AGPFS0,
@@ -34,7 +32,7 @@
  	&board_DWVS0,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
-@@ -566,6 +586,7 @@ static struct of_device_id const bcm963x
+@@ -561,6 +579,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, },

target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch

@@ -1,29 +1,29 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -450,6 +450,22 @@ static struct board_info __initdata boar
+@@ -447,6 +447,22 @@ static struct board_info __initdata boar
  	.has_ohci0			= 1,
  };
  
 +/* D-Link DSL-274xB revison C2/C3 */
 +static struct board_info __initdata board_dsl_274xb_rev_c = {
-+	.name				= "AW4139",
-+	.expected_cpu_id		= 0x6358,
++	.name = "AW4139",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_nb4_ser_r0 = {
- 	.name				= "NB4-SER-r0",
- 	.expected_cpu_id		= 0x6358,
-@@ -540,6 +556,7 @@ static const struct board_info __initcon
+ 	.name = "NB4-SER-r0",
+ 	.expected_cpu_id = 0x6358,
+@@ -533,6 +549,7 @@ static const struct board_info __initcon
  	&board_AGPFS0,
  	&board_CPVA642,
  	&board_DWVS0,
@@ -31,7 +31,7 @@
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -579,6 +596,7 @@ static struct of_device_id const bcm963x
+@@ -572,6 +589,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
  	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch

@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -323,6 +323,36 @@ static struct board_info __initdata boar
- 		.force_duplex_full	= 1,
+@@ -322,6 +322,36 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
  	},
  };
 +
@@ -14,30 +14,30 @@
 +};
 +
 +static struct board_info __initdata board_spw500v = {
-+	.name				= "SPW500V",
-+	.expected_cpu_id		= 0x6348,
++	.name = "SPW500V",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
++	.has_pci = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type			= SPROM_BCM4318,
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
-+		.board_fixups		= spw500v_fixups,
-+		.num_board_fixups	= ARRAY_SIZE(spw500v_fixups),
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = spw500v_fixups,
++		.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -549,6 +579,7 @@ static const struct board_info __initcon
+@@ -542,6 +572,7 @@ static const struct board_info __initcon
  	&board_96348gw_a,
  	&board_rta1025w_16,
  	&board_96348_D4PW,
@@ -45,7 +45,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -589,6 +620,7 @@ static struct of_device_id const bcm963x
+@@ -582,6 +613,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },

target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch

@@ -1,55 +1,53 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -217,6 +217,48 @@ static struct board_info __initdata boar
+@@ -216,6 +216,46 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
 +static struct board_info __initdata board_gw6200 = {
-+	.name				= "GW6200",
-+	.expected_cpu_id		= 0x6348,
++	.name = "GW6200",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
++
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+	.has_ohci0 = 1,
 +};
 +
 +static struct board_info __initdata board_gw6000 = {
-+	.name				= "GW6000",
-+	.expected_cpu_id		= 0x6348,
++	.name = "GW6000",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
++
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+	.has_ohci0 = 1,
 +};
-+
-+
 +
  static struct board_info __initdata board_FAST2404 = {
  	.name				= "F@ST2404",
  	.expected_cpu_id		= 0x6348,
-@@ -572,6 +614,8 @@ static const struct board_info __initcon
+@@ -565,6 +605,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
  	&board_96348gw,
@@ -58,7 +56,7 @@
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
-@@ -621,6 +665,8 @@ static struct of_device_id const bcm963x
+@@ -614,6 +656,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },
  	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },

target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch

@@ -1,38 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -395,6 +395,31 @@ static struct board_info __initdata boar
- 		.num_board_fixups	= ARRAY_SIZE(spw500v_fixups),
+@@ -392,6 +392,31 @@ static struct board_info __initdata boar
+ 		.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
  	},
  };
 +
 +static struct board_info __initdata board_96348sv = {
-+	.name				= "MAGIC",
-+	.expected_cpu_id		= 0x6348,
++	.name = "MAGIC",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
++
++	.has_enet1 = 1,
 +	.enet1 = {
 +		/* it has BP_ENET_EXTERNAL_PHY */
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+	.has_ohci0			= 1,
-+	.has_pccard			= 1,
-+	.has_ehci0			= 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -624,6 +649,7 @@ static const struct board_info __initcon
+@@ -615,6 +640,7 @@ static const struct board_info __initcon
  	&board_rta1025w_16,
  	&board_96348_D4PW,
  	&board_spw500v,
@@ -40,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -667,6 +693,7 @@ static struct of_device_id const bcm963x
+@@ -658,6 +684,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, },

target/linux/bcm63xx/patches-5.4/508-board_hw553.patch

@@ -1,39 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -616,6 +616,32 @@ static struct board_info __initdata boar
- 	.has_ehci0 = 1,
- 	.num_usbh_ports			= 2,
+@@ -607,6 +607,31 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
+ 	},
  };
 +
 +static struct board_info __initdata board_HW553 = {
-+	.name                           = "HW553",
-+	.expected_cpu_id                = 0x6358,
++	.name = "HW553",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet1                      = 1,
-+	.has_pci                        = 1,
-+	.use_fallback_sprom		= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100        = 1,
-+		.force_duplex_full      = 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
-+	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
-+	.num_usbh_ports			= 2,
-+
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -660,6 +686,7 @@ static const struct board_info __initcon
+@@ -651,6 +676,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
@@ -41,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -703,6 +730,7 @@ static struct of_device_id const bcm963x
+@@ -694,6 +720,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch

@@ -1,27 +1,26 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -112,6 +112,20 @@ static struct board_info __initdata boar
- 		.force_duplex_full	= 1,
+@@ -111,6 +111,19 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
  	},
  };
 +
 +static struct board_info __initdata board_rta1320_16m = {
-+	.name				= "RTA1320_16M",
-+	.expected_cpu_id		= 0x6338,
-+
-+	.has_enet0			= 1,
++	.name = "RTA1320_16M",
++	.expected_cpu_id = 0x6338,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -658,6 +672,7 @@ static const struct board_info __initcon
+@@ -648,6 +661,7 @@ static const struct board_info __initcon
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,
@@ -29,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -701,6 +716,7 @@ static struct of_device_id const bcm963x
+@@ -691,6 +705,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
  	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },

target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch

@@ -1,27 +1,27 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -656,6 +656,20 @@ static struct board_info __initdata boar
- 		.pci_dev			= 1,
+@@ -645,6 +645,20 @@ static struct board_info __initdata boar
+ 		.pci_dev = 1,
  	},
  };
 +
 + /* T-Home Speedport W 303V Typ B */
 +static struct board_info __initdata board_spw303v = {
-+	.name			= "96358-502V",
-+	.expected_cpu_id	= 0x6358,
++	.name = "96358-502V",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0		= 1,
-+	.has_pci		= 1,
++	.has_pci = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy 		= 1,
-+		.use_internal_phy 	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -702,6 +716,7 @@ static const struct board_info __initcon
+@@ -691,6 +705,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 */
  };
  
-@@ -753,6 +768,7 @@ static struct of_device_id const bcm963x
+@@ -742,6 +757,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, },

target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch

@@ -1,33 +1,34 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -434,6 +434,26 @@ static struct board_info __initdata boar
- 	.has_pccard			= 1,
- 	.has_ehci0			= 1,
+@@ -430,6 +430,27 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
+ 	},
  };
 +
 +static struct board_info __initdata board_V2500V_BB = {
-+	.name				= "V2500V_BB",
-+        .expected_cpu_id                = 0x6348,
++	.name = "V2500V_BB",
++	.expected_cpu_id = 0x6348,
 +
-+        .has_enet0                      = 1,
-+        .has_enet1                      = 1,
-+        .has_pci                        = 1,
++	.has_pci = 1,
 +
-+        .enet0 = {
-+                .has_phy                = 1,
-+                .use_internal_phy       = 1,
-+        },
-+        .enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+                .force_speed_100        = 1,
-+                .force_duplex_full      = 1,
++	.has_enet0 = 1,
++	.enet0 = {
++		.has_phy = 1,
++		.use_internal_phy = 1,
++	},
++
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -705,6 +725,7 @@ static const struct board_info __initcon
+@@ -694,6 +715,7 @@ static const struct board_info __initcon
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
@@ -35,7 +36,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -743,6 +764,7 @@ static struct of_device_id const bcm963x
+@@ -732,6 +754,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -43,7 +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, },
-@@ -802,6 +824,22 @@ void __init board_bcm963xx_init(void)
+@@ -791,6 +814,22 @@ void __init board_bcm963xx_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);

target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch

@@ -1,31 +1,29 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -208,6 +208,24 @@ static struct board_info __initdata boar
+@@ -206,6 +206,22 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
-+
 +/* BT Voyager 2110 */
 +static struct board_info __initdata board_V2110 = {
-+	.name				= "V2110",
-+	.expected_cpu_id		= 0x6348,
++	.name = "V2110",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
-+
 +
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -726,6 +744,7 @@ static const struct board_info __initcon
+@@ -716,6 +732,7 @@ static const struct board_info __initcon
  	&board_spw500v,
  	&board_96348sv,
  	&board_V2500V_BB,
@@ -33,7 +31,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -764,6 +783,7 @@ static struct of_device_id const bcm963x
+@@ -754,6 +771,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },

target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch

@@ -58,10 +58,10 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
  #endif /* __BOARD_COMMON_H */
 --- /dev/null
 +++ b/arch/mips/bcm63xx/boards/board_livebox.c
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,153 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
++ * License. See the file "COPYING" in the main directory of this archive
 + * for more details.
 + *
 + * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
@@ -90,28 +90,26 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
 + */
 +#ifdef CONFIG_BCM63XX_CPU_6348
 +static struct board_info __initdata board_livebox_blue5g = {
-+	.name				= "Livebox-blue-5g",
-+	.expected_cpu_id		= 0x6348,
++	.name = "Livebox-blue-5g",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.ephy_reset_gpio = 6,
++	.ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		  .has_phy		= 1,
-+		  .phy_id 		= 31,
++		.has_phy = 1,
++		.phy_id = 31,
 +	},
-+
-+	.ephy_reset_gpio		= 6,
-+	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
-+
-+	.has_ohci0			= 1,
-+	.has_pccard			= 1,
 +};
 +#endif
 +
@@ -121,7 +119,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
 +static const struct board_info __initdata *bcm963xx_boards[] = {
 +#ifdef CONFIG_BCM63XX_CPU_6348
 +	&board_livebox_blue5g
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6348 */
 +};
 +
 +static struct of_device_id const livebox_boards_dt[] = {
@@ -155,7 +153,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
 +		printk(KERN_ERR PFX "unable to fetch mac address\n");
 +		return -ENODEV;
 +	}
-+        mac_addr_used++;
++	mac_addr_used++;
 +
 +	return 0;
 +}

target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch

@@ -1,40 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -226,6 +226,33 @@ static struct board_info __initdata boar
+@@ -222,6 +222,31 @@ static struct board_info __initdata boar
+ 	},
  };
  
- 
 +static struct board_info __initdata board_ct536_ct5621 = {
-+	.name				= "CT536_CT5621",
-+	.expected_cpu_id		= 0x6348,
++	.name = "CT536_CT5621",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 0,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
-+	.has_ohci0 = 1,
-+	.has_pccard = 1,
-+	.has_ehci0 = 1,
-+
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -745,6 +772,7 @@ static const struct board_info __initcon
+@@ -733,6 +758,7 @@ static const struct board_info __initcon
  	&board_96348sv,
  	&board_V2500V_BB,
  	&board_V2110,
@@ -42,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -785,6 +813,8 @@ static struct of_device_id const bcm963x
+@@ -773,6 +799,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, },

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
-@@ -624,6 +624,7 @@ static struct board_info __initdata boar
+@@ -615,6 +615,7 @@ static struct board_info __initdata boar
  	},
  
  	.has_ohci0			= 1,

target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch

@@ -1,37 +1,36 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -253,6 +253,30 @@ static struct board_info __initdata boar
+@@ -247,6 +247,29 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_96348A_122 = {
-+	.name				= "96348A-122",
-+	.expected_cpu_id		= 0x6348,
++	.name = "96348A-122",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
-+	.has_ohci0 = 1,
-+
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -774,6 +798,7 @@ static const struct board_info __initcon
+@@ -760,6 +783,7 @@ static const struct board_info __initcon
  	&board_V2500V_BB,
  	&board_V2110,
  	&board_ct536_ct5621,
@@ -39,7 +38,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -815,6 +840,7 @@ static struct of_device_id const bcm963x
+@@ -801,6 +825,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, },

target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch

@@ -1,40 +1,41 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -225,6 +225,33 @@ static struct board_info __initdata boar
+@@ -222,6 +222,34 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_CPVA502plus = {
-+	.name				= "CPVA502+",
-+	.expected_cpu_id		= 0x6348,
++	.name = "CPVA502+",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
++	.has_pci = 1,
++	.ephy_reset_gpio = 4,
++	.ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
++
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
++		.has_phy = 1,
++		.phy_id = 0,
 +	},
 +
-+	.ephy_reset_gpio		= 4,
-+	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
-+
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
- 
++
  static struct board_info __initdata board_ct536_ct5621 = {
- 	.name				= "CT536_CT5621",
-@@ -799,6 +826,7 @@ static const struct board_info __initcon
+ 	.name = "CT536_CT5621",
+ 	.expected_cpu_id = 0x6348,
+@@ -784,6 +812,7 @@ static const struct board_info __initcon
  	&board_V2110,
  	&board_ct536_ct5621,
  	&board_96348A_122,
@@ -42,7 +43,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -850,6 +878,7 @@ static struct of_device_id const bcm963x
+@@ -835,6 +864,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, },

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
-@@ -790,6 +790,58 @@ static struct board_info __initdata boar
+@@ -776,6 +776,52 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -18,50 +18,44 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 + */
 +#ifdef CONFIG_BCM63XX_CPU_6368
 +static struct board_info __initdata board_96368mvwg = {
-+	.name				= "96368MVWG",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MVWG",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+
-+	.has_usbd			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port1",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port2",
 +			},
-+
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0x12,
-+				.name	= "port0",
++				.used = 1,
++				.phy_id = 0x12,
++				.name = "port0",
 +			},
-+
 +			[5] = {
-+				.used	= 1,
-+				.phy_id	= 0x11,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 0x11,
++				.name = "port3",
 +			},
 +		},
 +	},
-+
-+	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
 +};
 +#endif /* CONFIG_BCM63XX_CPU_6368 */
 +
@@ -69,7 +63,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -840,6 +892,9 @@ static const struct board_info __initcon
+@@ -826,6 +872,9 @@ static const struct board_info __initcon
  	&board_HW553,
  	&board_spw303v,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
@@ -79,7 +73,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -900,6 +955,7 @@ static struct of_device_id const bcm963x
+@@ -886,6 +935,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch

@@ -9,53 +9,49 @@ 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
-@@ -839,6 +839,45 @@ static struct board_info __initdata boar
- 	.has_ohci0 = 1,
- 	.has_ehci0 = 1,
+@@ -819,6 +819,41 @@ static struct board_info __initdata boar
+ 		},
+ 	},
  };
 +
 +static struct board_info __initdata board_96368mvngr = {
-+	.name				= "96368MVNgr",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MVNgr",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
-+
-+	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -894,6 +933,7 @@ static const struct board_info __initcon
+@@ -874,6 +909,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
@@ -63,7 +59,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  };
  
-@@ -955,6 +995,7 @@ static struct of_device_id const bcm963x
+@@ -935,6 +971,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch

@@ -9,34 +9,33 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -64,6 +64,33 @@ static struct board_info __initdata boar
+@@ -64,6 +64,32 @@ static struct board_info __initdata boar
  		.use_fullspeed		= 0,
  		.port_no		= 0,
  	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},

target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch

@@ -9,40 +9,39 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -92,6 +92,40 @@ static struct board_info __initdata boar
+@@ -91,6 +91,39 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_963281TAN = {
-+	.name				= "963281TAN",
-+	.expected_cpu_id		= 0x6328,
++	.name = "963281TAN",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -50,7 +49,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -916,6 +950,7 @@ static const struct board_info __initcon
+@@ -891,6 +924,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -58,7 +57,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -970,6 +1005,7 @@ static struct of_device_id const bcm963x
+@@ -945,6 +979,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch

@@ -10,51 +10,50 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -126,6 +126,51 @@ static struct board_info __initdata boar
+@@ -124,6 +124,50 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_dsl_274xb_f1 = {
-+	.name				= "AW4339U",
-+	.expected_cpu_id		= 0x6328,
++	.name = "AW4339U",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
-+	.has_caldata			= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor		= PCI_VENDOR_ID_ATHEROS,
-+			.caldata_offset	= 0x7d1000,
-+			.slot		= 0,
-+			.led_pin	= -1,
-+			.led_active_high	= 1,
++			.vendor = PCI_VENDOR_ID_ATHEROS,
++			.caldata_offset = 0x7d1000,
++			.slot = 0,
++			.led_pin = -1,
++			.led_active_high = 1,
 +		},
 +	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 4",
++				.name = "Port 4",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 3",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 2",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 1",
 +			},
 +		},
 +	},
@@ -62,7 +61,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -951,6 +996,7 @@ static const struct board_info __initcon
+@@ -925,6 +969,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
@@ -70,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,
-@@ -1007,6 +1053,7 @@ static struct of_device_id const bcm963x
+@@ -981,6 +1026,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch

@@ -1,31 +1,30 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -567,6 +567,24 @@ static struct board_info __initdata boar
+@@ -556,6 +556,23 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
 +/* NetGear DG834G v4 */
 +static struct board_info __initdata board_96348W3 = {
-+ 	.name	 			= "96348W3",
-+	.expected_cpu_id		= 0x6348,
++ 	.name = "96348W3",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+	.has_ohci0	 		= 1,
 +};
 +
  static struct board_info __initdata board_96348_D4PW = {
- 	.name				= "D-4P-W",
- 	.expected_cpu_id		= 0x6348,
-@@ -1026,6 +1044,7 @@ static const struct board_info __initcon
+ 	.name = "D-4P-W",
+ 	.expected_cpu_id = 0x6348,
+@@ -999,6 +1016,7 @@ static const struct board_info __initcon
  	&board_ct536_ct5621,
  	&board_96348A_122,
  	&board_CPVA502plus,
@@ -33,7 +32,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
  	&board_96358vw,
-@@ -1079,6 +1098,7 @@ static struct of_device_id const bcm963x
+@@ -1052,6 +1070,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, },

target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch

@@ -1,37 +1,37 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -872,6 +872,30 @@ static struct board_info __initdata boar
- 	.num_usbh_ports			= 2,
+@@ -855,6 +855,30 @@ static struct board_info __initdata boar
+ 	},
  };
  
 +static struct board_info __initdata board_ct6373_1 = {
-+	.name				= "CT6373-1",
-+	.expected_cpu_id	= 0x6358,
++	.name = "CT6373-1",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enet1			= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_HW553 = {
- 	.name                           = "HW553",
- 	.expected_cpu_id                = 0x6358,
-@@ -1055,6 +1079,7 @@ static const struct board_info __initcon
+ 	.name = "HW553",
+ 	.expected_cpu_id = 0x6358,
+@@ -1027,6 +1051,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 */
-@@ -1112,6 +1137,7 @@ static struct of_device_id const bcm963x
+@@ -1084,6 +1109,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
  	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch

@@ -1,40 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -935,6 +935,33 @@ static struct board_info __initdata boar
- 		.use_internal_phy 	= 1,
+@@ -917,6 +917,31 @@ static struct board_info __initdata boar
+ 		.use_internal_phy = 1,
  	},
  };
 +
 +/* D-Link DVA-G3810BN/TL */
 +static struct board_info __initdata board_DVAG3810BN = {
-+	.name			= "DVAG3810BN",
-+	.expected_cpu_id	= 0x6358,
++	.name = "DVAG3810BN",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0		= 1,
-+	.has_enet1		= 1,
-+	.has_pci		= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+
-+	.has_ohci0		= 1,
-+	.has_pccard		= 1,
-+	.has_ehci0		= 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1082,6 +1109,7 @@ static const struct board_info __initcon
+@@ -1054,6 +1079,7 @@ static const struct board_info __initcon
  	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,
@@ -42,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
-@@ -1140,6 +1168,7 @@ static struct of_device_id const bcm963x
+@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },

target/linux/bcm63xx/patches-5.4/526-board_nb6.patch

@@ -1,29 +1,28 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -964,6 +964,32 @@ static struct board_info __initdata boar
+@@ -944,6 +944,31 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
 +#ifdef CONFIG_BCM63XX_CPU_6362
 +static struct board_info __initdata board_nb6 = {
-+	.name				= "NB6",
-+	.expected_cpu_id		= 0x6362,
++	.name = "NB6",
++	.expected_cpu_id = 0x6362,
 +
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
-+
-+	.has_enetsw			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name	= "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
@@ -33,7 +32,7 @@
  /*
   * known 6368 boards
   */
-@@ -1111,6 +1137,9 @@ static const struct board_info __initcon
+@@ -1081,6 +1106,9 @@ static const struct board_info __initcon
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
@@ -43,7 +42,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
-@@ -1179,6 +1208,9 @@ static struct of_device_id const bcm963x
+@@ -1149,6 +1177,9 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif

target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch

@@ -1,29 +1,29 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -501,6 +501,22 @@ static struct board_info __initdata boar
+@@ -490,6 +490,22 @@ static struct board_info __initdata boar
  	.has_ehci0			= 1,
  };
  
 +static struct board_info __initdata board_FAST2604 = {
-+	.name						= "F@ST2604",
-+	.expected_cpu_id			= 0x6348,
++	.name = "F@ST2604",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_pci					= 1,
-+	.has_ohci0					= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
-+	.has_enet1					= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_rta1025w_16 = {
  	.name				= "RTA1025W_16",
  	.expected_cpu_id		= 0x6348,
-@@ -1110,6 +1126,7 @@ static const struct board_info __initcon
+@@ -1079,6 +1095,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,
-@@ -1182,6 +1199,7 @@ static struct of_device_id const bcm963x
+@@ -1151,6 +1168,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, },

target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch

@@ -1,56 +1,56 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -127,6 +127,49 @@ static struct board_info __initdata boar
+@@ -125,6 +125,49 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_A4001N1 = {
-+	.name					= "963281T_TEF",
-+	.expected_cpu_id			= 0x6328,
++	.name = "963281T_TEF",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  static struct board_info __initdata board_dsl_274xb_f1 = {
- 	.name				= "AW4339U",
- 	.expected_cpu_id		= 0x6328,
-@@ -1107,6 +1150,7 @@ static const struct board_info __initcon
+ 	.name = "AW4339U",
+ 	.expected_cpu_id = 0x6328,
+@@ -1076,6 +1119,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
-@@ -1169,6 +1213,7 @@ static struct of_device_id const bcm963x
+@@ -1138,6 +1182,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -93,6 +93,78 @@ static struct board_info __initdata boar
+@@ -92,6 +92,78 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -32,54 +32,54 @@
 +};
 +
 +static struct board_info __initdata board_AR5387un = {
-+	.name					= "96328A-1441N1",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328A-1441N1",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ar5387un_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ar5387un_fixups),
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ar5387un_fixups,
++		.num_board_fixups = ARRAY_SIZE(ar5387un_fixups),
 +	},
 +};
 +
  static struct board_info __initdata board_963281TAN = {
- 	.name				= "963281TAN",
- 	.expected_cpu_id		= 0x6328,
-@@ -1149,6 +1221,7 @@ static const struct board_info __initcon
+ 	.name = "963281TAN",
+ 	.expected_cpu_id = 0x6328,
+@@ -1118,6 +1190,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,
-@@ -1216,6 +1289,7 @@ static struct of_device_id const bcm963x
+@@ -1185,6 +1258,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -93,6 +93,60 @@ static struct board_info __initdata boar
+@@ -92,6 +92,60 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -14,54 +14,54 @@
 +};
 +
 +static struct board_info __initdata board_AR5381u = {
-+	.name					= "96328A-1241N",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328A-1241N",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ar5381u_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ar5381u_fixups),
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ar5381u_fixups,
++		.num_board_fixups = ARRAY_SIZE(ar5381u_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
  	{ .offset = 2, .value = 0x05bb },
  	{ .offset = 65, .value = 0x1204 },
-@@ -1221,6 +1275,7 @@ static const struct board_info __initcon
+@@ -1190,6 +1244,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,
-@@ -1289,6 +1344,7 @@ static struct of_device_id const bcm963x
+@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },

target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch

@@ -1,27 +1,26 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -411,6 +411,20 @@ static struct board_info __initdata boar
+@@ -406,6 +406,19 @@ static struct board_info __initdata boar
  	.name				= "96345GW2",
  	.expected_cpu_id		= 0x6345,
  };
 +
 +static struct board_info __initdata board_rta770bw = {
-+	.name				= "RTA770BW",
-+	.expected_cpu_id		= 0x6345,
-+
-+	.has_enet0			= 1,
++	.name = "RTA770BW",
++	.expected_cpu_id = 0x6345,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1289,6 +1303,7 @@ static const struct board_info __initcon
+@@ -1258,6 +1271,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
@@ -29,7 +28,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
-@@ -1356,6 +1371,7 @@ static struct of_device_id const bcm963x
+@@ -1325,6 +1339,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6345
  	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },

target/linux/bcm63xx/patches-5.4/532-board_hw556.patch

@@ -8,100 +8,102 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1121,6 +1122,92 @@ static struct board_info __initdata boar
+@@ -1102,6 +1103,94 @@ static struct board_info __initdata boar
  	},
  };
  
-+static struct board_info __initdata board_HW556_C = {
-+	.name					= "HW556_C",
-+	.expected_cpu_id			= 0x6358,
++static struct board_info __initdata board_HW556_A = {
++	.name = "HW556_A",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata				= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_RALINK,
-+			.caldata_offset		= 0xeffe00,
-+			.slot			= 1,
-+			.eeprom			= "rt2x00.eeprom",
++			.vendor = PCI_VENDOR_ID_ATHEROS,
++			.caldata_offset = 0xf7e000,
++			.slot = 1,
++			.endian_check = 1,
++			.led_pin = 2,
++			.led_active_high = 1,
 +		},
 +	},
 +
-+	.has_enet1				= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
-+static struct board_info __initdata board_HW556_A = {
-+	.name					= "HW556_A",
-+	.expected_cpu_id			= 0x6358,
 +
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 2,
++static struct board_info __initdata board_HW556_B = {
++	.name = "HW556_B",
++	.expected_cpu_id = 0x6358,
++
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata				= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_ATHEROS,
-+			.caldata_offset		= 0xf7e000,
-+			.slot			= 1,
-+			.endian_check		= 1,
-+			.led_pin		= 2,
-+			.led_active_high	= 1,
++			.vendor = PCI_VENDOR_ID_ATHEROS,
++			.caldata_offset = 0xefe000,
++			.slot = 1,
++			.endian_check = 1,
++			.led_pin = 2,
++			.led_active_high = 1,
 +		},
 +	},
 +
-+	.has_enet1				= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
-+static struct board_info __initdata board_HW556_B = {
-+	.name					= "HW556_B",
-+	.expected_cpu_id			= 0x6358,
 +
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 2,
++static struct board_info __initdata board_HW556_C = {
++	.name = "HW556_C",
++	.expected_cpu_id = 0x6358,
++
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata				= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_ATHEROS,
-+			.caldata_offset		= 0xefe000,
-+			.slot			= 1,
-+			.endian_check		= 1,
-+			.led_pin		= 2,
-+			.led_active_high	= 1,
++			.vendor = PCI_VENDOR_ID_RALINK,
++			.caldata_offset = 0xeffe00,
++			.slot = 1,
++			.eeprom = "rt2x00.eeprom",
 +		},
 +	},
 +
-+	.has_enet1				= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
- 	.name			= "96358-502V",
-@@ -1338,6 +1425,9 @@ static const struct board_info __initcon
+ 	.name = "96358-502V",
+@@ -1306,6 +1395,9 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
  	&board_HW553,
@@ -111,7 +113,7 @@
  	&board_spw303v,
  	&board_DVAG3810BN,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -1408,6 +1498,9 @@ static struct of_device_id const bcm963x
+@@ -1376,6 +1468,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, },

target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch

@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -426,6 +426,25 @@ static struct board_info __initdata boar
- 		.force_duplex_full	= 1,
+@@ -420,6 +420,24 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
  	},
  };
 +
@@ -11,22 +11,21 @@
 +// to handle both Annex A as well as Annex B -
 +// the loaded firmware makes the only difference
 +static struct board_info __initdata board_rta770w = {
-+	.name				= "RTA770W",
-+	.expected_cpu_id		= 0x6345,
-+
-+	.has_enet0			= 1,
++	.name = "RTA770W",
++	.expected_cpu_id = 0x6345,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1391,6 +1410,7 @@ static const struct board_info __initcon
+@@ -1361,6 +1379,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
  	&board_rta770bw,
@@ -34,7 +33,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
-@@ -1462,6 +1482,7 @@ static struct of_device_id const bcm963x
+@@ -1432,6 +1451,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6345
  	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
  	{ .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },

target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch

@@ -12,43 +12,42 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -341,6 +341,43 @@ static struct board_info __initdata boar
+@@ -338,6 +338,42 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_FAST2704V2 = {
-+	.name				= "F@ST2704V2",
-+	.expected_cpu_id		= 0x6328,
++	.name = "F@ST2704V2",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.has_usbd			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.has_usbd = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -56,7 +55,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1400,6 +1437,7 @@ static const struct board_info __initcon
+@@ -1369,6 +1405,7 @@ static const struct board_info __initcon
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
@@ -64,7 +63,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1472,6 +1510,7 @@ static struct of_device_id const bcm963x
+@@ -1441,6 +1478,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, },

target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch

@@ -6,41 +6,37 @@ 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
-@@ -1330,6 +1330,41 @@ static struct board_info __initdata boar
+@@ -1308,6 +1308,37 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_fast2504n = {
-+	.name				= "F@ST2504n",
-+	.expected_cpu_id		= 0x6362,
-+
-+	.has_enetsw			= 1,
++	.name = "F@ST2504n",
++	.expected_cpu_id = 0x6362,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -48,7 +44,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -1491,6 +1526,7 @@ static const struct board_info __initcon
+@@ -1459,6 +1490,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
@@ -56,7 +52,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
-@@ -1571,6 +1607,7 @@ static struct of_device_id const bcm963x
+@@ -1539,6 +1571,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362

target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -50,6 +50,55 @@ static struct board_info __initdata boar
+@@ -50,6 +50,52 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  
  /*
@@ -8,44 +8,41 @@
 + */
 +#ifdef CONFIG_BCM63XX_CPU_6318
 +static struct board_info __initdata board_96318ref = {
-+	.name				= "96318REF",
-+	.expected_cpu_id		= 0x6318,
++	.name = "96318REF",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+
-+	.has_usbd			= 1,
++	.has_pci = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -56,7 +53,7 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1465,6 +1514,9 @@ static const struct board_info __initcon
+@@ -1429,6 +1475,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
  	&board_cvg834g,
  #endif /* CONFIG_BCM63XX_CPU_3368 */
@@ -66,7 +63,7 @@
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_AR5381u,
-@@ -1539,6 +1591,9 @@ static struct of_device_id const bcm963x
+@@ -1503,6 +1552,9 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_3368
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
  #endif

target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch

@@ -1,49 +1,46 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -96,6 +96,50 @@ static struct board_info __initdata boar
+@@ -93,6 +93,47 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_96318ref_p300 = {
-+	.name				= "96318REF_P300",
-+	.expected_cpu_id		= 0x6318,
++	.name = "96318REF_P300",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+
-+	.has_usbd			= 1,
++	.has_pci = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -51,7 +48,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1516,6 +1560,7 @@ static const struct board_info __initcon
+@@ -1477,6 +1518,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
@@ -59,7 +56,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -1593,6 +1638,7 @@ static struct of_device_id const bcm963x
+@@ -1554,6 +1596,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },

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
-@@ -1552,6 +1552,50 @@ static struct board_info __initdata boar
+@@ -1510,6 +1510,45 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -8,39 +8,34 @@
 + */
 +#ifdef CONFIG_BCM63XX_CPU_63268
 +static struct board_info __initdata board_963269bhr = {
-+	.name				= "963269BHR",
-+	.expected_cpu_id		= 0x63268,
++	.name = "963269BHR",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_pci			= 1,
-+
-+	.has_ehci0			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ehci0 = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
@@ -51,7 +46,7 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1629,6 +1673,9 @@ static const struct board_info __initcon
+@@ -1587,6 +1626,9 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
@@ -61,7 +56,7 @@
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1716,6 +1763,7 @@ static struct of_device_id const bcm963x
+@@ -1674,6 +1716,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268

target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch

@@ -8,29 +8,29 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -647,6 +647,21 @@ static struct board_info __initdata boar
+@@ -633,6 +633,21 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
 +static struct board_info __initdata board_96348gw_10_AR1004G = {
-+	.name				= "AR1004G",
-+	.expected_cpu_id		= 0x6348,
++	.name = "AR1004G",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	
++	.has_pci = 1,
++
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
- 
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -1647,6 +1662,7 @@ static const struct board_info __initcon
+ 	.name = "V2110",
+@@ -1600,6 +1615,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,
-@@ -1708,6 +1724,7 @@ static struct of_device_id const bcm963x
+@@ -1661,6 +1677,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6348

target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch

@@ -1,50 +1,45 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1608,6 +1608,53 @@ static struct board_info __initdata boar
+@@ -1561,6 +1561,48 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_vw6339gu = {
-+	.name				= "VW6339GU",
-+	.expected_cpu_id		= 0x63268,
++	.name = "VW6339GU",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "LAN2",
++				.used = 1,
++				.phy_id = 1,
++				.name = "LAN2",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "LAN4",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN4",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
-+
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 7,
-+				.name	= "WAN",
++				.used = 1,
++				.phy_id = 7,
++				.name = "WAN",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
@@ -54,7 +49,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -1691,6 +1738,7 @@ static const struct board_info __initcon
+@@ -1644,6 +1686,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963269bhr,
@@ -62,7 +57,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -1781,6 +1829,7 @@ static struct of_device_id const bcm963x
+@@ -1734,6 +1777,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },

target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch

@@ -1,68 +1,61 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1570,6 +1570,72 @@ static struct board_info __initdata boar
+@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +static struct board_info __initdata board_963268bu_p300 = {
-+	.name				= "963268BU_P300",
-+	.expected_cpu_id		= 0x63268,
++	.name = "963268BU_P300",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 1,
-+
-+	.has_usbd			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 17,
-+				.name	= "FE1",
++				.used = 1,
++				.phy_id = 17,
++				.name = "FE1",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "GbE2",
++				.used = 1,
++				.phy_id = 4,
++				.name = "GbE2",
 +			},
-+
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0,
-+				.name	= "GbE3",
++				.used = 1,
++				.phy_id = 0,
++				.name = "GbE3",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
-+
 +			[5] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "GbE1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "GbE1",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
-+
 +			[6] = {
-+				.used	= 1,
-+				.phy_id	= 24,
-+				.name	= "GbE4",
++				.used = 1,
++				.phy_id = 24,
++				.name = "GbE4",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
-+
 +			[7] = {
-+				.used	= 1,
-+				.phy_id	= 25,
-+				.name	= "GbE5",
++				.used = 1,
++				.phy_id = 25,
++				.name = "GbE5",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
@@ -71,9 +64,9 @@
 +};
 +
  static struct board_info __initdata board_963269bhr = {
- 	.name				= "963269BHR",
- 	.expected_cpu_id		= 0x63268,
-@@ -1737,6 +1803,7 @@ static const struct board_info __initcon
+ 	.name = "963269BHR",
+ 	.expected_cpu_id = 0x63268,
+@@ -1685,6 +1744,7 @@ static const struct board_info __initcon
  	&board_96368mvngr,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -81,7 +74,7 @@
  	&board_963269bhr,
  	&board_vw6339gu,
  #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -1828,6 +1895,7 @@ static struct of_device_id const bcm963x
+@@ -1776,6 +1836,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268

target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch

@@ -9,9 +9,9 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1564,6 +1566,47 @@ static struct board_info __initdata boar
- 	.has_ohci0 = 1,
- 	.has_ehci0 = 1,
+@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar
+ 		},
+ 	},
  };
 +
 +static struct sprom_fixup __initdata wap5813n_fixups[] = {
@@ -24,15 +24,14 @@
 +};
 +
 +static struct board_info __initdata board_WAP5813n = {
-+	.name				= "96369R-1231N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96369R-1231N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[4] = {
@@ -46,18 +45,19 @@
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= wap5813n_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(wap5813n_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = wap5813n_fixups,
++		.num_board_fixups = ARRAY_SIZE(wap5813n_fixups),
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1801,6 +1844,7 @@ static const struct board_info __initcon
+@@ -1742,6 +1785,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,
-@@ -1893,6 +1937,7 @@ static struct of_device_id const bcm963x
+@@ -1834,6 +1878,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch

@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1567,6 +1567,59 @@ static struct board_info __initdata boar
- 	.has_ehci0 = 1,
+@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar
+ 	},
  };
  
 +static struct sprom_fixup __initdata vr3025u_fixups[] = {
@@ -14,53 +14,53 @@
 +};
 +
 +static struct board_info __initdata board_VR3025u = {
-+	.name					= "96368M-1541N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368M-1541N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw				= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vr3025u_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vr3025u_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vr3025u_fixups,
++		.num_board_fixups = ARRAY_SIZE(vr3025u_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1844,6 +1897,7 @@ static const struct board_info __initcon
+@@ -1785,6 +1838,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
-@@ -1937,6 +1991,7 @@ static struct of_device_id const bcm963x
+@@ -1878,6 +1932,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },

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
-@@ -1620,6 +1620,59 @@ static struct board_info __initdata boar
+@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -14,53 +14,53 @@
 +};
 +
 +static struct board_info __initdata board_VR3025un = {
-+	.name					= "96368M-1341N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368M-1341N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw				= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vr3025un_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vr3025un_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vr3025un_fixups,
++		.num_board_fixups = ARRAY_SIZE(vr3025un_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1898,6 +1951,7 @@ static const struct board_info __initcon
+@@ -1839,6 +1892,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
-@@ -1992,6 +2046,7 @@ static struct of_device_id const bcm963x
+@@ -1933,6 +1987,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },

target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch

@@ -1,55 +1,55 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1576,6 +1576,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3
  	{ .offset = 115, .value = 0xfad9 },
  };
  
 +static struct board_info __initdata board_P870HW51A_V2 = {
-+	.name				= "P870HW-51a_v2",
-+	.expected_cpu_id		= 0x6368,
++	.name = "P870HW-51a_v2",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_VR3025u = {
- 	.name					= "96368M-1541N",
- 	.expected_cpu_id		= 0x6368,
-@@ -1950,6 +1992,7 @@ static const struct board_info __initcon
+ 	.name = "96368M-1541N",
+ 	.expected_cpu_id = 0x6368,
+@@ -1891,6 +1933,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,
-@@ -2048,6 +2091,7 @@ static struct of_device_id const bcm963x
+@@ -1989,6 +2032,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

target/linux/bcm63xx/patches-5.4/546-board_hw520.patch

@@ -1,43 +1,43 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1262,6 +1262,36 @@ static struct board_info __initdata boar
+@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_HW520 = {
-+	.name				= "HW6358GW_B",
-+	.expected_cpu_id		= 0x6358,
++	.name = "HW6358GW_B",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enet0			= 1,
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
-+	.has_enet1			= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_HW553 = {
- 	.name                           = "HW553",
- 	.expected_cpu_id                = 0x6358,
-@@ -1978,6 +2008,7 @@ static const struct board_info __initcon
+ 	.name = "HW553",
+ 	.expected_cpu_id = 0x6358,
+@@ -1919,6 +1949,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,
-@@ -2068,6 +2099,7 @@ static struct of_device_id const bcm963x
+@@ -2009,6 +2040,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, },

target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch

@@ -1,56 +1,56 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -349,6 +349,49 @@ static struct board_info __initdata boar
+@@ -341,6 +341,49 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_A4001N = {
-+	.name				= "96328dg2x2",
-+	.expected_cpu_id		= 0x6328,
++	.name = "96328dg2x2",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  static struct board_info __initdata board_A4001N1 = {
- 	.name					= "963281T_TEF",
- 	.expected_cpu_id			= 0x6328,
-@@ -1960,6 +2003,7 @@ static const struct board_info __initcon
+ 	.name = "963281T_TEF",
+ 	.expected_cpu_id = 0x6328,
+@@ -1901,6 +1944,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,
-@@ -2045,6 +2089,7 @@ static struct of_device_id const bcm963x
+@@ -1986,6 +2030,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6328

target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -142,6 +142,74 @@ static struct board_info __initdata boar
+@@ -136,6 +136,72 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -27,55 +27,53 @@
 +};
 +
 +static struct board_info __initdata board_dsl_2751b_d1 = {
-+	.name				= "AW5200B",
-+	.expected_cpu_id		= 0x6318,
++	.name = "AW5200B",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.has_enetsw			= 1,
-+
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= dsl2751b_e1_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(dsl2751b_e1_fixups),
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = dsl2751b_e1_fixups,
++		.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1997,6 +2065,7 @@ static const struct board_info __initcon
+@@ -1938,6 +2004,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
@@ -83,7 +81,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2087,6 +2156,7 @@ static struct of_device_id const bcm963x
+@@ -2028,6 +2095,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, },

target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch

@@ -1,28 +1,28 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1708,6 +1708,30 @@ static struct board_info __initdata boar
- 	.has_ehci0 = 1,
+@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar
+ 	},
  };
  
 +static struct board_info __initdata board_DGND3700v1_3800B = {
-+	.name				= "DGND3700v1_3800B",
-+	.expected_cpu_id		= 0x6368,
++	.name = "DGND3700v1_3800B",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[5] = {
-+				.used  = 1,
-+				.phy_id  = 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name  = "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
@@ -31,7 +31,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2136,6 +2160,7 @@ static const struct board_info __initcon
+@@ -2075,6 +2099,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,
-@@ -2238,6 +2263,7 @@ static struct of_device_id const bcm963x
+@@ -2177,6 +2202,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch

@@ -1,38 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1373,6 +1373,31 @@ static struct board_info __initdata boar
+@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_homehub2a = {
-+	.name				= "HOMEHUB2A",
-+	.expected_cpu_id		= 0x6358,
++	.name = "HOMEHUB2A",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enet1			= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100        = 1,
-+		.force_duplex_full      = 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 			= SPROM_BCM4322,
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
++		.type = SPROM_BCM4322,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_HW520 = {
- 	.name				= "HW6358GW_B",
- 	.expected_cpu_id		= 0x6358,
-@@ -2145,6 +2170,7 @@ static const struct board_info __initcon
+ 	.name = "HW6358GW_B",
+ 	.expected_cpu_id = 0x6358,
+@@ -2084,6 +2109,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,
-@@ -2252,6 +2278,7 @@ static struct of_device_id const bcm963x
+@@ -2191,6 +2217,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, },

target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch

@@ -1,50 +1,50 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1757,6 +1757,52 @@ static struct board_info __initdata boar
+@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_HG655b = {
-+	.name				= "HW65x",
-+	.expected_cpu_id		= 0x6368,
++	.name = "HW65x",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata			= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_RALINK,
-+			.caldata_offset		= 0x7c0000,
-+			.slot			= 1,
-+			.eeprom			= "rt2x00.eeprom",
++			.vendor = PCI_VENDOR_ID_RALINK,
++			.caldata_offset = 0x7c0000,
++			.slot = 1,
++			.eeprom = "rt2x00.eeprom",
 +		},
 +	},
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2187,6 +2233,7 @@ static const struct board_info __initcon
+@@ -2126,6 +2172,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,
-@@ -2290,6 +2337,7 @@ static struct of_device_id const bcm963x
+@@ -2229,6 +2276,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },

target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch

@@ -1,52 +1,51 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -210,6 +210,45 @@ static struct board_info __initdata boar
- 		.num_board_fixups		= ARRAY_SIZE(dsl2751b_e1_fixups),
+@@ -202,6 +202,44 @@ static struct board_info __initdata boar
+ 		.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
  	},
  };
 +
 +static struct board_info __initdata board_FAST2704N = {
-+	.name				= "F@ST2704N",
-+	.expected_cpu_id		= 0x6318,
++	.name = "F@ST2704N",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.has_enetsw			= 1,
-+
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
++
++	.use_fallback_sprom = 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2161,6 +2200,7 @@ static const struct board_info __initcon
+@@ -2100,6 +2138,7 @@ static const struct board_info __initcon
  	&board_96318ref,
  	&board_96318ref_p300,
  	&board_dsl_2751b_d1,
@@ -54,7 +53,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2255,6 +2295,7 @@ static struct of_device_id const bcm963x
+@@ -2194,6 +2233,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, },

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
-@@ -1990,6 +1990,59 @@ static struct board_info __initdata boar
+@@ -1945,6 +1945,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -14,53 +14,53 @@
 +};
 +
 +static struct board_info __initdata board_VR3026e = {
-+	.name					= "96368MT-1341N1",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MT-1341N1",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw				= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vr3026e_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vr3026e_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vr3026e_fixups,
++		.num_board_fixups = ARRAY_SIZE(vr3026e_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2277,6 +2330,7 @@ static const struct board_info __initcon
+@@ -2215,6 +2268,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
-@@ -2377,6 +2431,7 @@ static struct of_device_id const bcm963x
+@@ -2315,6 +2369,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, },

target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch

@@ -1,57 +1,57 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -623,6 +623,50 @@ static struct board_info __initdata boar
+@@ -610,6 +610,50 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_R5010UNV2 = {
-+	.name					= "96328ang",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328ang",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2264,6 +2308,7 @@ static const struct board_info __initcon
+@@ -2202,6 +2246,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,
-@@ -2359,6 +2404,7 @@ static struct of_device_id const bcm963x
+@@ -2297,6 +2342,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, },

target/linux/bcm63xx/patches-5.4/555-board_HG622.patch

@@ -1,50 +1,50 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1886,6 +1886,52 @@ static struct board_info __initdata boar
+@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_HG622 = {
-+	.name				= "96368MVWG_hg622",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MVWG_hg622",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata			= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_RALINK,
-+			.caldata_offset		= 0xfa0000,
-+			.slot			= 1,
-+			.eeprom			= "rt2x00.eeprom",
++			.vendor = PCI_VENDOR_ID_RALINK,
++			.caldata_offset = 0xfa0000,
++			.slot = 1,
++			.eeprom = "rt2x00.eeprom",
 +		},
 +	},
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2371,6 +2417,7 @@ static const struct board_info __initcon
+@@ -2309,6 +2355,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,
-@@ -2479,6 +2526,7 @@ static struct of_device_id const bcm963x
+@@ -2417,6 +2464,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, },

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
-@@ -1840,6 +1840,42 @@ static struct board_info __initdata boar
+@@ -1795,6 +1795,43 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -9,15 +9,15 @@
 +};
 +
 +static struct board_info __initdata board_EVG2000 = {
-+	.name				= "96369PVG",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96369PVG",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[5] = {
@@ -30,20 +30,21 @@
 +			},
 +		},
 +	},
-+	.use_fallback_sprom	= 1,
++
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type			= SPROM_BCM4322,
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
-+		.board_fixups		= EVG2000_fixups,
-+		.num_board_fixups	= ARRAY_SIZE(EVG2000_fixups),
++		.type = SPROM_BCM4322,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = EVG2000_fixups,
++		.num_board_fixups = ARRAY_SIZE(EVG2000_fixups),
 +	},
 +};
 +
  static struct board_info __initdata board_HG655b = {
- 	.name				= "HW65x",
- 	.expected_cpu_id		= 0x6368,
-@@ -2417,6 +2453,7 @@ static const struct board_info __initcon
+ 	.name = "HW65x",
+ 	.expected_cpu_id = 0x6368,
+@@ -2355,6 +2392,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -51,7 +52,7 @@
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
-@@ -2529,6 +2566,7 @@ static struct of_device_id const bcm963x
+@@ -2467,6 +2505,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, },

target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch

@@ -1,58 +1,55 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1730,6 +1730,51 @@ static struct board_info __initdata boar
+@@ -1695,6 +1695,48 @@ static struct board_info __initdata boar
   * known 6368 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +static struct board_info __initdata board_AV4202N = {
-+	.name				= "96368_Swiss_S1",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368_Swiss_S1",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
-+	.use_fallback_sprom	= 1,
++
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
-+
 +};
 +
  static struct board_info __initdata board_96368mvwg = {
- 	.name				= "96368MVWG",
- 	.expected_cpu_id		= 0x6368,
-@@ -2450,6 +2495,7 @@ static const struct board_info __initcon
+ 	.name = "96368MVWG",
+ 	.expected_cpu_id = 0x6368,
+@@ -2389,6 +2431,7 @@ static const struct board_info __initcon
  	&board_fast2504n,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
@@ -60,7 +57,7 @@
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
-@@ -2557,6 +2603,7 @@ static struct of_device_id const bcm963x
+@@ -2496,6 +2539,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

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
-@@ -2214,6 +2214,106 @@ static struct board_info __initdata boar
+@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -60,54 +60,54 @@
 +};
 +
 +static struct board_info __initdata board_VH4032N = {
-+	.name				= "VH4032N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "VH4032N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name   = "LAN4",
++				.name = "LAN4",
 +			},
 +			[1] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 2,
-+				.name   = "LAN3",
++				.name = "LAN3",
 +			},
 +			[2] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 3,
-+				.name   = "LAN2",
++				.name = "LAN2",
 +			},
 +			[3] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 4,
-+				.name   = "LAN1",
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vh4032n_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vh4032n_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vh4032n_fixups,
++		.num_board_fixups = ARRAY_SIZE(vh4032n_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2503,6 +2603,7 @@ static const struct board_info __initcon
+@@ -2439,6 +2539,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -115,7 +115,7 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_VR3026e,
-@@ -2614,6 +2715,7 @@ static struct of_device_id const bcm963x
+@@ -2550,6 +2651,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, },

target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch

@@ -1,36 +1,36 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2064,6 +2064,29 @@ static struct board_info __initdata boar
+@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_R1000H = {
-+	.name				= "R1000H",
-+	.expected_cpu_id		= 0x6368,
++	.name = "R1000H",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[5] = {
-+				.used  = 1,
-+				.phy_id  = 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name  = "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
 +};
 +
  static struct board_info __initdata board_VR3025u = {
- 	.name					= "96368M-1541N",
- 	.expected_cpu_id		= 0x6368,
-@@ -2603,6 +2626,7 @@ static const struct board_info __initcon
+ 	.name = "96368M-1541N",
+ 	.expected_cpu_id = 0x6368,
+@@ -2539,6 +2562,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -38,7 +38,7 @@
  	&board_VH4032N,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2704,6 +2728,7 @@ static struct of_device_id const bcm963x
+@@ -2640,6 +2664,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368

target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch

@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -143,6 +143,67 @@ static struct board_info __initdata boar
+@@ -137,6 +137,65 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -19,56 +19,54 @@
 +};
 +
 +static struct board_info __initdata board_AR5315u = {
-+	.name				= "96318A-1441N1",
-+	.expected_cpu_id		= 0x6318,
++	.name = "96318A-1441N1",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.has_enetsw			= 1,
-+
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "LAN4",
++				.name = "LAN4",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "LAN2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN2",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ar5315u_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ar5315u_fixups),
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ar5315u_fixups,
++		.num_board_fixups = ARRAY_SIZE(ar5315u_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
  	{ .offset = 96, .value = 0x2046 },
  	{ .offset = 97, .value = 0xfe9d },
-@@ -2546,6 +2607,7 @@ static const struct board_info __initcon
+@@ -2482,6 +2541,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
@@ -76,7 +74,7 @@
  	&board_dsl_2751b_d1,
  	&board_FAST2704N,
  #endif /* CONFIG_BCM63XX_CPU_6318 */
-@@ -2648,6 +2710,7 @@ static struct of_device_id const bcm963x
+@@ -2584,6 +2644,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, },

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
-@@ -357,6 +357,73 @@ static struct board_info __initdata boar
+@@ -345,6 +345,71 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -25,56 +25,54 @@
 +};
 +
 +static struct board_info __initdata board_AD1018 = {
-+	.name					= "96328avngr",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328avngr",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "FIBRE",
++				.used = 1,
++				.phy_id = 1,
++				.name = "FIBRE",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "LAN2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN2",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ad1018_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ad1018_fixups),
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ad1018_fixups,
++		.num_board_fixups = ARRAY_SIZE(ad1018_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata ar5381u_fixups[] = {
  	{ .offset = 97, .value = 0xfee5 },
  	{ .offset = 98, .value = 0x157c },
-@@ -2613,6 +2680,7 @@ static const struct board_info __initcon
+@@ -2547,6 +2612,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
@@ -82,7 +80,7 @@
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
-@@ -2724,6 +2792,8 @@ static struct of_device_id const bcm963x
+@@ -2658,6 +2724,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, },

target/linux/bcm63xx/patches-5.4/562-board_sr102.patch

@@ -1,56 +1,49 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2662,6 +2662,49 @@ static struct board_info __initdata boar
+@@ -2594,6 +2594,42 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_BSKYB_63168 = {
-+	.name				= "BSKYB_63168",
-+	.expected_cpu_id		= 0x63268,
++	.name = "BSKYB_63168",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 0,
-+
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 2,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
-+
 +		},
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2767,6 +2810,7 @@ static const struct board_info __initcon
+@@ -2699,6 +2735,7 @@ static const struct board_info __initcon
  	&board_963268bu_p300,
  	&board_963269bhr,
  	&board_vw6339gu,
@@ -58,7 +51,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x
+@@ -2812,6 +2849,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, },

target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch

@@ -1,51 +1,48 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2616,6 +2616,44 @@ static struct board_info __initdata boar
+@@ -2553,6 +2553,41 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_VR3032u = {
-+	.name				= "963168M-1841N1",
-+	.expected_cpu_id	= 0x63268,
++	.name = "963168M-1841N1",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports		= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "LAN2",
++				.used = 1,
++				.phy_id = 1,
++				.name = "LAN2",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "LAN4",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN4",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +};
 +
  static struct board_info __initdata board_vw6339gu = {
- 	.name				= "VW6339GU",
- 	.expected_cpu_id		= 0x63268,
-@@ -2809,6 +2847,7 @@ static const struct board_info __initcon
+ 	.name = "VW6339GU",
+ 	.expected_cpu_id = 0x63268,
+@@ -2734,6 +2769,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
  	&board_963269bhr,
@@ -53,7 +50,7 @@
  	&board_vw6339gu,
  	&board_BSKYB_63168,
  #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -2923,6 +2962,7 @@ static struct of_device_id const bcm963x
+@@ -2848,6 +2884,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, },

target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch

@@ -1,38 +1,37 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1818,6 +1818,31 @@ static struct board_info __initdata boar
+@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_dgnd3700v2 = {
-+	.name				= "96362ADVN2xh",
-+	.expected_cpu_id		= 0x6362,
++	.name = "96362ADVN2xh",
++	.expected_cpu_id = 0x6362,
 +
-+	.has_pci			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
-+
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name	= "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
 +};
 +
  static struct board_info __initdata board_fast2504n = {
- 	.name				= "F@ST2504n",
- 	.expected_cpu_id		= 0x6362,
-@@ -2826,6 +2851,7 @@ static const struct board_info __initcon
+ 	.name = "F@ST2504n",
+ 	.expected_cpu_id = 0x6362,
+@@ -2748,6 +2772,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
@@ -40,7 +39,7 @@
  	&board_fast2504n,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2940,6 +2966,7 @@ static struct of_device_id const bcm963x
+@@ -2862,6 +2887,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362

target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch

@@ -1,18 +1,18 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2641,6 +2641,31 @@ static struct board_info __initdata boar
+@@ -2577,6 +2577,31 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_VG8050 = {
-+	.name				= "963169P-1861N5",
-+	.expected_cpu_id		= 0x63268,
++	.name = "963169P-1861N5",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[6] = {
@@ -30,9 +30,9 @@
 +};
 +
  static struct board_info __initdata board_VR3032u = {
- 	.name				= "963168M-1841N1",
- 	.expected_cpu_id	= 0x63268,
-@@ -2873,6 +2898,7 @@ static const struct board_info __initcon
+ 	.name = "963168M-1841N1",
+ 	.expected_cpu_id = 0x63268,
+@@ -2794,6 +2819,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,
-@@ -2989,6 +3015,7 @@ static struct of_device_id const bcm963x
+@@ -2910,6 +2936,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, },

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
-@@ -1877,6 +1877,37 @@ static struct board_info __initdata boar
+@@ -1837,6 +1837,37 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -9,8 +9,8 @@
 +	.name = "hg253s",
 +	.expected_cpu_id = 0x6362,
 +
-+	.has_ehci0 = 1,
 +	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +	.num_usbh_ports = 1,
 +
 +	.has_enetsw = 1,
@@ -28,7 +28,7 @@
 +
 +			[5] = {
 +				.used = 1,
-+				.phy_id	= 24,
++				.phy_id = 24,
 +				.timing_sel = 1,
 +				.name = "WAN",
 +			},
@@ -38,7 +38,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -2878,6 +2909,7 @@ static const struct board_info __initcon
+@@ -2799,6 +2830,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,
-@@ -2992,6 +3024,7 @@ static struct of_device_id const bcm963x
+@@ -2913,6 +2945,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362

target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch

@@ -1,56 +1,56 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -627,6 +627,49 @@ static struct board_info __initdata boar
+@@ -612,6 +612,49 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_PDG_A4001N_A_000_1A1_AX = {
-+	.name					= "96328avng",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328avng",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  static struct board_info __initdata board_A4001N1 = {
- 	.name					= "963281T_TEF",
- 	.expected_cpu_id			= 0x6328,
-@@ -2847,6 +2890,7 @@ static const struct board_info __initcon
+ 	.name = "963281T_TEF",
+ 	.expected_cpu_id = 0x6328,
+@@ -2768,6 +2811,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,
-@@ -2952,6 +2996,7 @@ static struct of_device_id const bcm963x
+@@ -2873,6 +2917,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, },

target/linux/bcm63xx/patches-5.4/568-board-H500s.patch

@@ -1,27 +1,26 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2867,6 +2867,37 @@ static struct board_info __initdata boar
+@@ -2788,6 +2788,36 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_H500s = {
-+	.name				= "BXK00C-1.6",
-+	.expected_cpu_id		= 0x63268,
++	.name = "BXK00C-1.6",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[3] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 12,
-+				.name   = "WAN",
++				.name = "WAN",
 +			},
-+
 +			[4] = {
 +				.used = 1,
 +				.phy_id = 0,
@@ -38,7 +37,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2978,6 +3009,7 @@ static const struct board_info __initcon
+@@ -2899,6 +2929,7 @@ static const struct board_info __initcon
  	&board_VR3032u,
  	&board_vw6339gu,
  	&board_BSKYB_63168,
@@ -46,7 +45,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -3096,6 +3128,8 @@ static struct of_device_id const bcm963x
+@@ -3017,6 +3048,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, },