bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 564-board-DGND3700v2.patch

diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
index e8f30443850bcc9944f570e7bc187094e08c20d3..9f2e7eaf293a2db5443a7fa1d1d09e458b42d863 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
@@ -1,38 +1,37 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1818,6 +1818,31 @@ static struct board_info __initdata boar
+@@ -1783,6 +1783,30 @@ static struct board_info __initdata boar
        },
  };
  
 +static struct board_info __initdata board_dgnd3700v2 = {
-+      .name                           = "96362ADVN2xh",
-+      .expected_cpu_id                = 0x6362,
++      .name = "96362ADVN2xh",
++      .expected_cpu_id = 0x6362,
 +
-+      .has_pci                        = 1,
++      .has_pci = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
++      .num_usbh_ports = 2,
 +
-+      .has_ohci0                      = 1,
-+      .has_ehci0                      = 1,
-+      .num_usbh_ports                 = 2,
-+
-+      .has_enetsw                     = 1,
++      .has_enetsw = 1,
 +      .enetsw = {
 +              .used_ports = {
 +                      [4] = {
-+                              .used   = 1,
-+                              .phy_id = 0xff,
++                              .used = 1,
++                              .phy_id = 0xff,
 +                              .bypass_link = 1,
 +                              .force_speed = 1000,
 +                              .force_duplex_full = 1,
-+                              .name   = "RGMII",
++                              .name = "RGMII",
 +                      },
 +              },
 +      },
 +};
 +
  static struct board_info __initdata board_fast2504n = {
-       .name                           = "F@ST2504n",
-       .expected_cpu_id                = 0x6362,
-@@ -2826,6 +2851,7 @@ static const struct board_info __initcon
+       .name = "F@ST2504n",
+       .expected_cpu_id = 0x6362,
+@@ -2748,6 +2772,7 @@ static const struct board_info __initcon
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
        &board_nb6,
@@ -40,7 +39,7 @@
        &board_fast2504n,
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2940,6 +2966,7 @@ static struct of_device_id const bcm963x
+@@ -2862,6 +2887,7 @@ static struct of_device_id const bcm963x
        { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6362