bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 503-board-CPVA642.patch

diff --git a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch
index c85702fa841bf12884156e3c8a382d3cbf2bde0b..3ab1813ca6dbd93fe3e4f826792dafd20422392f 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch
+++ b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch
@@ -1,32 +1,30 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -383,6 +383,25 @@ static struct board_info __initdata boar
+@@ -382,6 +382,23 @@ static struct board_info __initdata boar
        .num_usbh_ports                 = 2,
  };
  
 +static struct board_info __initdata board_CPVA642 = {
-+      .name                           = "CPVA642",
-+      .expected_cpu_id                = 0x6358,
++      .name = "CPVA642",
++      .expected_cpu_id = 0x6358,
 +
-+      .has_enet1                      = 1,
-+      .has_pci                        = 1,
++      .has_pci = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 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_ehci0 = 1,
 +};
-+
 +
  static struct board_info __initdata board_AGPFS0 = {
        .name                           = "AGPF-S0",
        .expected_cpu_id                = 0x6358,
-@@ -519,6 +538,7 @@ static const struct board_info __initcon
+@@ -514,6 +531,7 @@ static const struct board_info __initcon
        &board_96358vw,
        &board_96358vw2,
        &board_AGPFS0,
@@ -34,7 +32,7 @@
        &board_DWVS0,
        &board_nb4_ser_r0,
        &board_nb4_fxc_r1,
-@@ -566,6 +586,7 @@ static struct of_device_id const bcm963x
+@@ -561,6 +579,7 @@ static struct of_device_id const bcm963x
        { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
        { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, },
        { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },