bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 525-board_dva-g3810bn-tl-1.patch

diff --git a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
index 5c356cfe048b172326120f4acc77265cf5292c3c..9cfd82d7ee2a731ee37e5bf798cf6e4fe0393e0d 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
@@ -1,40 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -935,6 +935,33 @@ static struct board_info __initdata boar
-               .use_internal_phy       = 1,
+@@ -917,6 +917,31 @@ static struct board_info __initdata boar
+               .use_internal_phy = 1,
        },
  };
 +
 +/* D-Link DVA-G3810BN/TL */
 +static struct board_info __initdata board_DVAG3810BN = {
-+      .name                   = "DVAG3810BN",
-+      .expected_cpu_id        = 0x6358,
++      .name = "DVAG3810BN",
++      .expected_cpu_id = 0x6358,
 +
-+      .has_enet0              = 1,
-+      .has_enet1              = 1,
-+      .has_pci                = 1,
++      .has_pccard = 1,
++      .has_pci = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
 +
++      .has_enet0 = 1,
 +      .enet0 = {
-+              .has_phy                = 1,
-+              .use_internal_phy       = 1,
++              .has_phy = 1,
++              .use_internal_phy = 1,
 +      },
 +
++      .has_enet1 = 1,
 +      .enet1 = {
-+              .has_phy                = 1,
-+              .phy_id                 = 0,
-+              .force_speed_100        = 1,
-+              .force_duplex_full      = 1,
++              .has_phy = 1,
++              .phy_id = 0,
++              .force_speed_100 = 1,
++              .force_duplex_full = 1,
 +      },
-+
-+
-+      .has_ohci0              = 1,
-+      .has_pccard             = 1,
-+      .has_ehci0              = 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1082,6 +1109,7 @@ static const struct board_info __initcon
+@@ -1054,6 +1079,7 @@ static const struct board_info __initcon
        &board_ct6373_1,
        &board_HW553,
        &board_spw303v,
@@ -42,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6368
        &board_96368mvwg,
-@@ -1140,6 +1168,7 @@ static struct of_device_id const bcm963x
+@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x
        { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
        { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
        { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },