bcm63xx: refactor board patches

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 530-board_AR-5381u.patch

diff --git a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
index 1842471033cc44a72706c18aa9fadf00026db409..0ede51519b5bd054a6ecb05e0b5cc3c9db688dbc 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
+++ b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -93,6 +93,60 @@ static struct board_info __initdata boar
+@@ -92,6 +92,60 @@ static struct board_info __initdata boar
        },
  };
  
@@ -14,54 +14,54 @@
 +};
 +
 +static struct board_info __initdata board_AR5381u = {
-+      .name                                   = "96328A-1241N",
-+      .expected_cpu_id                        = 0x6328,
++      .name = "96328A-1241N",
++      .expected_cpu_id = 0x6328,
 +
-+      .has_pci                                = 1,
-+      .use_fallback_sprom                     = 1,
-+      .has_ohci0                              = 1,
-+      .has_ehci0                              = 1,
-+      .num_usbh_ports                         = 1,
-+      .has_enetsw                             = 1,
++      .has_pci = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++      .num_usbh_ports = 1,
 +
++      .has_enetsw = 1,
 +      .enetsw = {
 +              .used_ports = {
 +                      [0] = {
-+                              .used           = 1,
-+                              .phy_id         = 1,
-+                              .name           = "Port 1",
++                              .used = 1,
++                              .phy_id = 1,
++                              .name = "Port 1",
 +                      },
 +                      [1] = {
-+                              .used           = 1,
-+                              .phy_id         = 2,
-+                              .name           = "Port 2",
++                              .used = 1,
++                              .phy_id = 2,
++                              .name = "Port 2",
 +                      },
 +                      [2] = {
-+                              .used           = 1,
-+                              .phy_id         = 3,
-+                              .name           = "Port 3",
++                              .used = 1,
++                              .phy_id = 3,
++                              .name = "Port 3",
 +                      },
 +                      [3] = {
-+                              .used           = 1,
-+                              .phy_id         = 4,
-+                              .name           = "Port 4",
++                              .used = 1,
++                              .phy_id = 4,
++                              .name = "Port 4",
 +                      },
 +              },
 +      },
 +
++      .use_fallback_sprom = 1,
 +      .fallback_sprom = {
-+              .type                           = SPROM_BCM43225,
-+              .pci_bus                        = 1,
-+              .pci_dev                        = 0,
-+              .board_fixups                   = ar5381u_fixups,
-+              .num_board_fixups               = ARRAY_SIZE(ar5381u_fixups),
++              .type = SPROM_BCM43225,
++              .pci_bus = 1,
++              .pci_dev = 0,
++              .board_fixups = ar5381u_fixups,
++              .num_board_fixups = ARRAY_SIZE(ar5381u_fixups),
 +      },
 +};
 +
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
        { .offset = 2, .value = 0x05bb },
        { .offset = 65, .value = 0x1204 },
-@@ -1221,6 +1275,7 @@ static const struct board_info __initcon
+@@ -1190,6 +1244,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6328
        &board_96328avng,
@@ -69,7 +69,7 @@
        &board_AR5387un,
        &board_963281TAN,
        &board_A4001N1,
-@@ -1289,6 +1344,7 @@ static struct of_device_id const bcm963x
+@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x
        { .compatible = "adb,a4001n1", .data = &board_A4001N1, },
        { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
        { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },