bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 528-board_A4001N1.patch

diff --git a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
index dd13df49202699314f6a5ad2f970a9b154c9837b..32164c6cfa64ba17e7837fa39f6b2a36e50a361c 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
+++ b/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