bcm63xx: refactor board patches

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 545-board_P870HW-51a_v2.patch

diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
index 2941a954cf5a1deeba9cea70c0424b9aeb483163..fd8eaba28e85ef0874da4f3b513623338b8f35be 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
@@ -1,55 +1,55 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1576,6 +1576,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3
        { .offset = 115, .value = 0xfad9 },
  };
  
 +static struct board_info __initdata board_P870HW51A_V2 = {
-+      .name                           = "P870HW-51a_v2",
-+      .expected_cpu_id                = 0x6368,
++      .name = "P870HW-51a_v2",
++      .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_BCM4318,
-+              .pci_bus                        = 0,
-+              .pci_dev                        = 1,
++              .type = SPROM_BCM4318,
++              .pci_bus = 0,
++              .pci_dev = 1,
 +      },
 +};
 +
  static struct board_info __initdata board_VR3025u = {
-       .name                                   = "96368M-1541N",
-       .expected_cpu_id                = 0x6368,
-@@ -1950,6 +1992,7 @@ static const struct board_info __initcon
+       .name = "96368M-1541N",
+       .expected_cpu_id = 0x6368,
+@@ -1891,6 +1933,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -57,7 +57,7 @@
        &board_VR3025u,
        &board_VR3025un,
        &board_WAP5813n,
-@@ -2048,6 +2091,7 @@ static struct of_device_id const bcm963x
+@@ -1989,6 +2032,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
        { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
        { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },