bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 540-board_vw6339gu.patch

diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
index d3e1ec6de41c4ef1cf66d4263631d069fda9d57c..6b996931d90b777c3ce5dfdb1572eb1860638bab 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
+++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
@@ -1,50 +1,45 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1608,6 +1608,53 @@ static struct board_info __initdata boar
+@@ -1561,6 +1561,48 @@ static struct board_info __initdata boar
                },
        },
  };
 +
 +static struct board_info __initdata board_vw6339gu = {
-+      .name                           = "VW6339GU",
-+      .expected_cpu_id                = 0x63268,
++      .name = "VW6339GU",
++      .expected_cpu_id = 0x63268,
 +
-+      .has_ehci0                      = 1,
-+      .has_ohci0                      = 1,
-+      .num_usbh_ports                 = 1,
-+
-+      .has_enetsw                     = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++      .num_usbh_ports = 1,
 +
++      .has_enetsw = 1,
 +      .enetsw = {
 +              .used_ports = {
 +                      [0] = {
-+                              .used   = 1,
-+                              .phy_id = 1,
-+                              .name   = "LAN2",
++                              .used = 1,
++                              .phy_id = 1,
++                              .name = "LAN2",
 +                      },
-+
 +                      [1] = {
-+                              .used   = 1,
-+                              .phy_id = 2,
-+                              .name   = "LAN3",
++                              .used = 1,
++                              .phy_id = 2,
++                              .name = "LAN3",
 +                      },
-+
 +                      [2] = {
-+                              .used   = 1,
-+                              .phy_id = 3,
-+                              .name   = "LAN4",
++                              .used = 1,
++                              .phy_id = 3,
++                              .name = "LAN4",
 +                      },
-+
 +                      [3] = {
-+                              .used   = 1,
-+                              .phy_id = 4,
-+                              .name   = "LAN1",
++                              .used = 1,
++                              .phy_id = 4,
++                              .name = "LAN1",
 +                      },
-+
 +                      [4] = {
-+                              .used   = 1,
-+                              .phy_id = 7,
-+                              .name   = "WAN",
++                              .used = 1,
++                              .phy_id = 7,
++                              .name = "WAN",
 +                              .mii_override = 1,
 +                              .timing_sel = 1,
 +                      },
@@ -54,7 +49,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -1691,6 +1738,7 @@ static const struct board_info __initcon
+@@ -1644,6 +1686,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963269bhr,
@@ -62,7 +57,7 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -1781,6 +1829,7 @@ static struct of_device_id const bcm963x
+@@ -1734,6 +1777,7 @@ static struct of_device_id const bcm963x
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
        { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },