bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 555-board_HG622.patch

diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
index 9ff6a103976949c5c500eac9d091a811874be26b..5842addf145c6a59233bf9fa0ee9aa4380f1f1d1 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
+++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
@@ -1,50 +1,50 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1886,6 +1886,52 @@ static struct board_info __initdata boar
+@@ -1841,6 +1841,52 @@ static struct board_info __initdata boar
        },
  };
  
 +static struct board_info __initdata board_HG622 = {
-+      .name                           = "96368MVWG_hg622",
-+      .expected_cpu_id                = 0x6368,
++      .name = "96368MVWG_hg622",
++      .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_caldata                    = 1,
++      .has_caldata = 1,
 +      .caldata = {
 +              {
-+                      .vendor                 = PCI_VENDOR_ID_RALINK,
-+                      .caldata_offset         = 0xfa0000,
-+                      .slot                   = 1,
-+                      .eeprom                 = "rt2x00.eeprom",
++                      .vendor = PCI_VENDOR_ID_RALINK,
++                      .caldata_offset = 0xfa0000,
++                      .slot = 1,
++                      .eeprom = "rt2x00.eeprom",
 +              },
 +      },
 +
-+      .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",
 +                      },
 +              },
 +      },
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
        { .offset = 97, .value = 0xfeb3 },
        { .offset = 98, .value = 0x1618 },
-@@ -2371,6 +2417,7 @@ static const struct board_info __initcon
+@@ -2309,6 +2355,7 @@ static const struct board_info __initcon
        &board_96368mvwg,
        &board_96368mvngr,
        &board_DGND3700v1_3800B,
@@ -61,7 +61,7 @@
        &board_HG655b,
        &board_P870HW51A_V2,
        &board_VR3025u,
-@@ -2479,6 +2526,7 @@ static struct of_device_id const bcm963x
+@@ -2417,6 +2464,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
        { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
        { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },