bcm63xx: refactor board patches

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 523-board_96348w3.patch

diff --git a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
index 06bbd5d0fe53b1a2702b427342093c1e8d1a2457..913f12f8d6c60cf41df5c83d69581d3dd3265dfb 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
+++ b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
@@ -1,31 +1,30 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -567,6 +567,24 @@ static struct board_info __initdata boar
+@@ -556,6 +556,23 @@ static struct board_info __initdata boar
        .has_ohci0 = 1,
  };
  
 +/* NetGear DG834G v4 */
 +static struct board_info __initdata board_96348W3 = {
-+      .name                           = "96348W3",
-+      .expected_cpu_id                = 0x6348,
++      .name = "96348W3",
++      .expected_cpu_id = 0x6348,
 +
-+      .has_enet1                      = 1,
-+      .has_pci                        = 1,
++      .has_pci = 1,
++      .has_ohci0 = 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,
 +};
 +
  static struct board_info __initdata board_96348_D4PW = {
-       .name                           = "D-4P-W",
-       .expected_cpu_id                = 0x6348,
-@@ -1026,6 +1044,7 @@ static const struct board_info __initcon
+       .name = "D-4P-W",
+       .expected_cpu_id = 0x6348,
+@@ -999,6 +1016,7 @@ static const struct board_info __initcon
        &board_ct536_ct5621,
        &board_96348A_122,
        &board_CPVA502plus,
@@ -33,7 +32,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
        &board_96358vw,
-@@ -1079,6 +1098,7 @@ static struct of_device_id const bcm963x
+@@ -1052,6 +1070,7 @@ static struct of_device_id const bcm963x
        { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
        { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },