bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 554-board_R5010UNv2.patch

diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
index 24b12f7ad7834d691677c1fc1b1e0213e80f13f7..6d8aedb7dc3414e2682fc566d857a49de879b12e 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
+++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
@@ -1,57 +1,57 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -623,6 +623,50 @@ static struct board_info __initdata boar
+@@ -610,6 +610,50 @@ static struct board_info __initdata boar
                },
        },
  };
 +
 +static struct board_info __initdata board_R5010UNV2 = {
-+      .name                                   = "96328ang",
-+      .expected_cpu_id                        = 0x6328,
++      .name = "96328ang",
++      .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_BCM43217,
-+              .pci_bus                        = 1,
-+              .pci_dev                        = 0,
++              .type = SPROM_BCM43217,
++              .pci_bus = 1,
++              .pci_dev = 0,
 +      },
 +};
 +
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2264,6 +2308,7 @@ static const struct board_info __initcon
+@@ -2202,6 +2246,7 @@ static const struct board_info __initcon
        &board_A4001N1,
        &board_dsl_274xb_f1,
        &board_FAST2704V2,
@@ -59,7 +59,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
        &board_96338gw,
-@@ -2359,6 +2404,7 @@ static struct of_device_id const bcm963x
+@@ -2297,6 +2342,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
        { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
        { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },