bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 507-board-MAGIC.patch

diff --git a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
index 4d20a18facf7226fe853bf10e68ad065971dfe8d..536e0339285dd52817ff127c0001686d5e78cec3 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
+++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
@@ -1,38 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -395,6 +395,31 @@ static struct board_info __initdata boar
-               .num_board_fixups       = ARRAY_SIZE(spw500v_fixups),
+@@ -392,6 +392,31 @@ static struct board_info __initdata boar
+               .num_board_fixups = ARRAY_SIZE(spw500v_fixups),
        },
  };
 +
 +static struct board_info __initdata board_96348sv = {
-+      .name                           = "MAGIC",
-+      .expected_cpu_id                = 0x6348,
++      .name = "MAGIC",
++      .expected_cpu_id = 0x6348,
 +
-+      .has_enet0                      = 1,
-+      .has_enet1                      = 1,
-+      .has_pci                        = 1,
++      .has_pccard = 1,
++      .has_pci = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
 +
++      .has_enet0 = 1,
 +      .enet0 = {
-+              .has_phy                = 1,
-+              .use_internal_phy       = 1,
++              .has_phy = 1,
++              .use_internal_phy = 1,
 +      },
++
++      .has_enet1 = 1,
 +      .enet1 = {
 +              /* it has BP_ENET_EXTERNAL_PHY */
-+              .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_pccard                     = 1,
-+      .has_ehci0                      = 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -624,6 +649,7 @@ static const struct board_info __initcon
+@@ -615,6 +640,7 @@ static const struct board_info __initcon
        &board_rta1025w_16,
        &board_96348_D4PW,
        &board_spw500v,
@@ -40,7 +40,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
        &board_96358vw,
-@@ -667,6 +693,7 @@ static struct of_device_id const bcm963x
+@@ -658,6 +684,7 @@ static struct of_device_id const bcm963x
        { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
        { .compatible = "tecom,gw6000", .data = &board_gw6000, },
        { .compatible = "tecom,gw6200", .data = &board_gw6200, },