bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 511-board_V2500V.patch

diff --git a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
index e7082ded75e3fc52f20fe16b77e448df2afde66c..d7526c9fdf22d5edd9ab4cd974e31ac81cf80b86 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
+++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
@@ -1,33 +1,34 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -434,6 +434,26 @@ static struct board_info __initdata boar
-       .has_pccard                     = 1,
-       .has_ehci0                      = 1,
+@@ -430,6 +430,27 @@ static struct board_info __initdata boar
+               .force_duplex_full = 1,
+       },
  };
 +
 +static struct board_info __initdata board_V2500V_BB = {
-+      .name                           = "V2500V_BB",
-+        .expected_cpu_id                = 0x6348,
++      .name = "V2500V_BB",
++      .expected_cpu_id = 0x6348,
 +
-+        .has_enet0                      = 1,
-+        .has_enet1                      = 1,
-+        .has_pci                        = 1,
++      .has_pci = 1,
 +
-+        .enet0 = {
-+                .has_phy                = 1,
-+                .use_internal_phy       = 1,
-+        },
-+        .enet1 = {
-+              .has_phy                = 1,
-+              .phy_id                 = 0,
-+                .force_speed_100        = 1,
-+                .force_duplex_full      = 1,
++      .has_enet0 = 1,
++      .enet0 = {
++              .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,
 +      },
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -705,6 +725,7 @@ static const struct board_info __initcon
+@@ -694,6 +715,7 @@ static const struct board_info __initcon
        &board_96348_D4PW,
        &board_spw500v,
        &board_96348sv,
@@ -35,7 +36,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
        &board_96358vw,
-@@ -743,6 +764,7 @@ static struct of_device_id const bcm963x
+@@ -732,6 +754,7 @@ static struct of_device_id const bcm963x
        { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
        { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
        { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -43,7 +44,7 @@
        { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
        { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
        { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -802,6 +824,22 @@ void __init board_bcm963xx_init(void)
+@@ -791,6 +814,22 @@ void __init board_bcm963xx_init(void)
                val &= MPI_CSBASE_BASE_MASK;
        }
        boot_addr = (u8 *)KSEG1ADDR(val);