bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 544-board_VR-3025un.patch

diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
index 207f6810fec8c8659ae8835f7230001aed6b9bd7..4a777540795608d25b40a881100f0220e39ac91d 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
+++ b/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, },