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 */
-@@ -1