bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 533-board_rta770w.patch

diff --git a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
index b6092ed068b999d4244678cee92cf2923be7c3af..fcac77b39d513944a73d69b3179119579e7bd5fb 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
+++ b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -426,6 +426,25 @@ static struct board_info __initdata boar
-               .force_duplex_full      = 1,
+@@ -420,6 +420,24 @@ static struct board_info __initdata boar
+               .force_duplex_full = 1,
        },
  };
 +
@@ -11,22 +11,21 @@
 +// to handle both Annex A as well as Annex B -
 +// the loaded firmware makes the only difference
 +static struct board_info __initdata board_rta770w = {
-+      .name                           = "RTA770W",
-+      .expected_cpu_id                = 0x6345,
-+
-+      .has_enet0                      = 1,
++      .name = "RTA770W",
++      .expected_cpu_id = 0x6345,
 +
++      .has_enet0 = 1,
 +      .enet0 = {
-+              .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,
 +      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  
  /*
-@@ -1391,6 +1410,7 @@ static const struct board_info __initcon
+@@ -1361,6 +1379,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6345
        &board_96345gw2,
        &board_rta770bw,
@@ -34,7 +33,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6345 */
  #ifdef CONFIG_BCM63XX_CPU_6348
        &board_96348r,
-@@ -1462,6 +1482,7 @@ static struct of_device_id const bcm963x
+@@ -1432,6 +1451,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6345
        { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
        { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },