bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 516-board_96348A-122.patch

diff --git a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
index 0843a99c419bd84e53a934301ef22c60aee5a5de..99c224e5ac79de3df4b01e5ee3fd376fde80b2e4 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
+++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
@@ -1,37 +1,36 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -253,6 +253,30 @@ static struct board_info __initdata boar
+@@ -247,6 +247,29 @@ static struct board_info __initdata boar
        },
  };
  
 +static struct board_info __initdata board_96348A_122 = {
-+      .name                           = "96348A-122",
-+      .expected_cpu_id                = 0x6348,
++      .name = "96348A-122",
++      .expected_cpu_id = 0x6348,
 +
-+      .has_enet1                      = 1,
-+      .has_pci                        = 1,
-+      .use_fallback_sprom             = 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,
-+
++      .use_fallback_sprom = 1,
 +      .fallback_sprom = {
-+              .type                           = SPROM_BCM4318,
-+              .pci_bus                        = 0,
-+              .pci_dev                        = 1,
++              .type = SPROM_BCM4318,
++              .pci_bus = 0,
++              .pci_dev = 1,
 +      },
 +};
 +
  static struct board_info __initdata board_96348gw = {
        .name                           = "96348GW",
        .expected_cpu_id                = 0x6348,
-@@ -774,6 +798,7 @@ static const struct board_info __initcon
+@@ -760,6 +783,7 @@ static const struct board_info __initcon
        &board_V2500V_BB,
        &board_V2110,
        &board_ct536_ct5621,
@@ -39,7 +38,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
        &board_96358vw,
-@@ -815,6 +840,7 @@ static struct of_device_id const bcm963x
+@@ -801,6 +825,7 @@ static struct of_device_id const bcm963x
        { .compatible = "bt,voyager-2110", .data = &board_V2110, },
        { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, },
        { .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, },