bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 542-board_WAP-5813n.patch

diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
index 5466c0c4f4610b7daffc5699f93d62c84e7d4919..e90c01a48a4ada5ed70eb1f88430ad92b47d439c 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
+++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
@@ -9,9 +9,9 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1564,6 +1566,47 @@ static struct board_info __initdata boar
-       .has_ohci0 = 1,
-       .has_ehci0 = 1,
+@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar
+               },
+       },
  };
 +
 +static struct sprom_fixup __initdata wap5813n_fixups[] = {
@@ -24,15 +24,14 @@
 +};
 +
 +static struct board_info __initdata board_WAP5813n = {
-+      .name                           = "96369R-1231N",
-+      .expected_cpu_id                = 0x6368,
++      .name = "96369R-1231N",
++      .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 = {
 +                      [4] = {
@@ -46,18 +45,19 @@
 +              },
 +      },
 +
++      .use_fallback_sprom = 1,
 +      .fallback_sprom = {
-+              .type                           = SPROM_BCM43222,
-+              .pci_bus                        = 0,
-+              .pci_dev                        = 1,
-+              .board_fixups                   = wap5813n_fixups,
-+              .num_board_fixups               = ARRAY_SIZE(wap5813n_fixups),
++              .type = SPROM_BCM43222,
++              .pci_bus = 0,
++              .pci_dev = 1,
++              .board_fixups = wap5813n_fixups,
++              .num_board_fixups = ARRAY_SIZE(wap5813n_fixups),
 +      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1801,6 +1844,7 @@ static const struct board_info __initcon
+@@ -1742,6 +1785,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
        &board_96368mvngr,
@@ -65,7 +65,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963268bu_p300,
-@@ -1893,6 +1937,7 @@ static struct of_device_id const bcm963x
+@@ -1834,6 +1878,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
        { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },