bcm63xx: refactor board patches

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 557-board_AV4202N.patch

diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
index 2722b9ef4edc48e31847bc3514d08fe8c50ee406..29e97108ed84f77e3a406a48a9b0ec794a85d06f 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
+++ b/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