bcm63xx: refactor board patches

[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 517_board_CPVA502plus.patch

diff --git a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
index a210ebb690c9201995732ccdc2796595ec89dbb6..f5427713b765db8de3bfe06b9338cf05a366d9a0 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
+++ b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
@@ -1,40 +1,41 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -225,6 +225,33 @@ static struct board_info __initdata boar
+@@ -222,6 +222,34 @@ static struct board_info __initdata boar
        },
  };
  
 +static struct board_info __initdata board_CPVA502plus = {
-+      .name                           = "CPVA502+",
-+      .expected_cpu_id                = 0x6348,
++      .name = "CPVA502+",
++      .expected_cpu_id = 0x6348,
 +
-+      .has_enet0                      = 1,
-+      .has_enet1                      = 1,
-+      .has_pci                        = 1,
-+      .use_fallback_sprom             = 1,
++      .has_pci = 1,
++      .ephy_reset_gpio = 4,
++      .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
 +
++      .has_enet0 = 1,
 +      .enet0 = {
-+              .has_phy                = 1,
-+              .use_internal_phy       = 1,
++              .has_phy = 1,
++              .use_internal_phy = 1,
 +      },
++
++      .has_enet1 = 1,
 +      .enet1 = {
-+              .has_phy                = 1,
-+              .phy_id                 = 0,
++              .has_phy = 1,
++              .phy_id = 0,
 +      },
 +
-+      .ephy_reset_gpio                = 4,
-+      .ephy_reset_gpio_flags          = GPIO_ACTIVE_LOW,
-+
++      .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_ct536_ct5621 = {
-       .name                           = "CT536_CT5621",
-@@ -799,6 +826,7 @@ static const struct board_info __initcon
+       .name = "CT536_CT5621",
+       .expected_cpu_id = 0x6348,
+@@ -784,6 +812,7 @@ static const struct board_info __initcon
        &board_V2110,
        &board_ct536_ct5621,
        &board_96348A_122,
@@ -42,7 +43,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
        &board_96358vw,
-@@ -850,6 +878,7 @@ static struct of_device_id const bcm963x
+@@ -835,6 +864,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, },