bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 558-board_VH4032N.patch

diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
index 8beea94da0dbe5cca0c8d53e7631f8fd417cb8c4..36c6c14aa3aea0f622b07ae4e4016662ee40aeae 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
+++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2214,6 +2214,106 @@ static struct board_info __initdata boar
+@@ -2167,6 +2167,106 @@ static struct board_info __initdata boar
        },
  };
  
@@ -60,54 +60,54 @@
 +};
 +
 +static struct board_info __initdata board_VH4032N = {
-+      .name                           = "VH4032N",
-+      .expected_cpu_id                = 0x6368,
++      .name = "VH4032N",
++      .expected_cpu_id = 0x6368,
 +
-+      .has_pci                        = 1,
-+      .use_fallback_sprom             = 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,
++                              .used = 1,
 +                              .phy_id = 1,
-+                              .name   = "LAN4",
++                              .name = "LAN4",
 +                      },
 +                      [1] = {
-+                              .used   = 1,
++                              .used = 1,
 +                              .phy_id = 2,
-+                              .name   = "LAN3",
++                              .name = "LAN3",
 +                      },
 +                      [2] = {
-+                              .used   = 1,
++                              .used = 1,
 +                              .phy_id = 3,
-+                              .name   = "LAN2",
++                              .name = "LAN2",
 +                      },
 +                      [3] = {
-+                              .used   = 1,
++                              .used = 1,
 +                              .phy_id = 4,
-+                              .name   = "LAN1",
++                              .name = "LAN1",
 +                      },
 +              },
 +      },
 +
++      .use_fallback_sprom = 1,
 +      .fallback_sprom = {
-+              .type                           = SPROM_BCM43222,
-+              .pci_bus                        = 0,
-+              .pci_dev                        = 1,
-+              .board_fixups                   = vh4032n_fixups,
-+              .num_board_fixups               = ARRAY_SIZE(vh4032n_fixups),
++              .type = SPROM_BCM43222,
++              .pci_bus = 0,
++              .pci_dev = 1,
++              .board_fixups = vh4032n_fixups,
++              .num_board_fixups = ARRAY_SIZE(vh4032n_fixups),
 +      },
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
        { .offset = 97, .value = 0xfeed },
        { .offset = 98, .value = 0x15d1 },
-@@ -2503,6 +2603,7 @@ static const struct board_info __initcon
+@@ -2439,6 +2539,7 @@ static const struct board_info __initcon
        &board_HG622,
        &board_HG655b,
        &board_P870HW51A_V2,
@@ -115,7 +115,7 @@
        &board_VR3025u,
        &board_VR3025un,
        &board_VR3026e,
-@@ -2614,6 +2715,7 @@ static struct of_device_id const bcm963x
+@@ -2550,6 +2651,7 @@ static struct of_device_id const bcm963x
        { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
        { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
        { .compatible = "netgear,evg2000", .data = &board_EVG2000, },