bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 547-board_A4001N.patch

diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
index 930cbdfd988ff0bbb635b8637e365591d3bfb7a8..df7621dbf8955e80ed20f7f7986f95722b3c65ae 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
+++ b/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