bcm63xx: refactor board patches

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 504-board_dsl_274xb_rev_c.patch

diff --git a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch
index f4df4443d5cac775873f1a34a7c0461f55ba2012..bc1791b2142186ef6ac0f5890ba7252b4d6f00c5 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch
@@ -1,29 +1,29 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -450,6 +450,22 @@ static struct board_info __initdata boar
+@@ -447,6 +447,22 @@ static struct board_info __initdata boar
        .has_ohci0                      = 1,
  };
  
 +/* D-Link DSL-274xB revison C2/C3 */
 +static struct board_info __initdata board_dsl_274xb_rev_c = {
-+      .name                           = "AW4139",
-+      .expected_cpu_id                = 0x6358,
++      .name = "AW4139",
++      .expected_cpu_id = 0x6358,
 +
-+      .has_enet1                      = 1,
-+      .has_pci                        = 1,
++      .has_pci = 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,
 +      },
 +};
 +
  static struct board_info __initdata board_nb4_ser_r0 = {
-       .name                           = "NB4-SER-r0",
-       .expected_cpu_id                = 0x6358,
-@@ -540,6 +556,7 @@ static const struct board_info __initcon
+       .name = "NB4-SER-r0",
+       .expected_cpu_id = 0x6358,
+@@ -533,6 +549,7 @@ static const struct board_info __initcon
        &board_AGPFS0,
        &board_CPVA642,
        &board_DWVS0,
@@ -31,7 +31,7 @@
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
  #endif /* CONFIG_BCM63XX_CPU_6358 */
-@@ -579,6 +596,7 @@ static struct of_device_id const bcm963x
+@@ -572,6 +589,7 @@ static struct of_device_id const bcm963x
        { .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
        { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
        { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },