bcm63xx: refactor board patches

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 563-board-VR-3032u.patch

diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
index 4c7ed728623ab0b3b5414c1178a33ba0220fc386..37e946a6ef4e214e05c356f75aaec3f87d85b223 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
+++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
@@ -1,51 +1,48 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2616,6 +2616,44 @@ static struct board_info __initdata boar
+@@ -2553,6 +2553,41 @@ static struct board_info __initdata boar
        },
  };
  
 +static struct board_info __initdata board_VR3032u = {
-+      .name                           = "963168M-1841N1",
-+      .expected_cpu_id        = 0x63268,
++      .name = "963168M-1841N1",
++      .expected_cpu_id = 0x63268,
 +
-+      .has_ehci0                      = 1,
-+      .has_ohci0                      = 1,
-+      .num_usbh_ports         = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++      .num_usbh_ports = 1,
 +
-+      .has_enetsw                     = 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",
 +                      },
 +              },
 +      },
 +};
 +
  static struct board_info __initdata board_vw6339gu = {
-       .name                           = "VW6339GU",
-       .expected_cpu_id                = 0x63268,
-@@ -2809,6 +2847,7 @@ static const struct board_info __initcon
+       .name = "VW6339GU",
+       .expected_cpu_id = 0x63268,
+@@ -2734,6 +2769,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
        &board_963268bu_p300,
        &board_963269bhr,
@@ -53,7 +50,7 @@
        &board_vw6339gu,
        &board_BSKYB_63168,
  #endif /* CONFIG_BCM63XX_CPU_63268 */
-@@ -2923,6 +2962,7 @@ static struct of_device_id const bcm963x
+@@ -2848,6 +2884,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_63268
        { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
        { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },