bcm63xx: refactor board patches

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 541-board_963268gu_p300.patch

diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
index 5a422b54deedda396954be844bd24c0880abf339..7530184ca5855c40b24de3191146d6ed3c6203b0 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
+++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
@@ -1,68 +1,61 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1570,6 +1570,72 @@ static struct board_info __initdata boar
+@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +static struct board_info __initdata board_963268bu_p300 = {
-+      .name                           = "963268BU_P300",
-+      .expected_cpu_id                = 0x63268,
++      .name = "963268BU_P300",
++      .expected_cpu_id = 0x63268,
 +
-+      .has_ehci0                      = 1,
-+      .has_ohci0                      = 1,
-+      .num_usbh_ports                 = 1,
-+
-+      .has_usbd                       = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++      .num_usbh_ports = 1,
 +
++      .has_usbd = 1,
 +      .usbd = {
-+              .use_fullspeed          = 0,
-+              .port_no                = 0,
++              .use_fullspeed = 0,
++              .port_no = 0,
 +      },
 +
-+      .has_enetsw                     = 1,
-+
++      .has_enetsw = 1,
 +      .enetsw = {
 +              .used_ports = {
 +                      [0] = {
-+                              .used   = 1,
-+                              .phy_id = 17,
-+                              .name   = "FE1",
++                              .used = 1,
++                              .phy_id = 17,
++                              .name = "FE1",
 +                      },
-+
 +                      [3] = {
-+                              .used   = 1,
-+                              .phy_id = 4,
-+                              .name   = "GbE2",
++                              .used = 1,
++                              .phy_id = 4,
++                              .name = "GbE2",
 +                      },
-+
 +                      [4] = {
-+                              .used   = 1,
-+                              .phy_id = 0,
-+                              .name   = "GbE3",
++                              .used = 1,
++                              .phy_id = 0,
++                              .name = "GbE3",
 +                              .mii_override = 1,
 +                              .timing_sel = 1,
 +                      },
-+
 +                      [5] = {
-+                              .used   = 1,
-+                              .phy_id = 1,
-+                              .name   = "GbE1",
++                              .used = 1,
++                              .phy_id = 1,
++                              .name = "GbE1",
 +                              .mii_override = 1,
 +                              .timing_sel = 1,
 +                      },
-+
 +                      [6] = {
-+                              .used   = 1,
-+                              .phy_id = 24,
-+                              .name   = "GbE4",
++                              .used = 1,
++                              .phy_id = 24,
++                              .name = "GbE4",
 +                              .mii_override = 1,
 +                              .timing_sel = 1,
 +                      },
-+
 +                      [7] = {
-+                              .used   = 1,
-+                              .phy_id = 25,
-+                              .name   = "GbE5",
++                              .used = 1,
++                              .phy_id = 25,
++                              .name = "GbE5",
 +                              .mii_override = 1,
 +                              .timing_sel = 1,
 +                      },
@@ -71,9 +64,9 @@
 +};
 +
  static struct board_info __initdata board_963269bhr = {
-       .name                           = "963269BHR",
-       .expected_cpu_id                = 0x63268,
-@@ -1737,6 +1803,7 @@ static const struct board_info __initcon
+       .name = "963269BHR",
+       .expected_cpu_id = 0x63268,
+@@ -1685,6 +1744,7 @@ static const struct board_info __initcon
        &board_96368mvngr,
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
@@ -81,7 +74,7 @@
        &board_963269bhr,
        &board_vw6339gu,
  #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -1828,6 +1895,7 @@ static struct of_device_id const bcm963x
+@@ -1776,6 +1836,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268