bcm63xx: refactor board patches

[openwrt/staging/chunkeey.git] / target / linux / bcm63xx / patches-5.4 / 559-board_R1000H.patch

diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
index ec7e4bacdcfe363ced6d25ab91ac227e14f58470..23b8c7890120d197e0c40c56401049d5c321c53a 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
+++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
@@ -1,36 +1,36 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2064,6 +2064,29 @@ static struct board_info __initdata boar
+@@ -2017,6 +2017,29 @@ static struct board_info __initdata boar
        },
  };
  
 +static struct board_info __initdata board_R1000H = {
-+      .name                           = "R1000H",
-+      .expected_cpu_id                = 0x6368,
++      .name = "R1000H",
++      .expected_cpu_id = 0x6368,
 +
-+      .has_pci                        = 1,
-+      .has_ohci0                      = 1,
-+      .has_ehci0                      = 1,
++      .has_pci = 1,
++      .has_ohci0 = 1,
++      .has_ehci0 = 1,
 +
-+      .has_enetsw                     = 1,
++      .has_enetsw = 1,
 +      .enetsw = {
 +              .used_ports = {
 +                      [5] = {
-+                              .used  = 1,
-+                              .phy_id  = 0xff,
++                              .used = 1,
++                              .phy_id = 0xff,
 +                              .bypass_link = 1,
 +                              .force_speed = 1000,
 +                              .force_duplex_full = 1,
-+                              .name  = "RGMII",
++                              .name = "RGMII",
 +                      },
 +              },
 +      },
 +};
 +
  static struct board_info __initdata board_VR3025u = {
-       .name                                   = "96368M-1541N",
-       .expected_cpu_id                = 0x6368,
-@@ -2603,6 +2626,7 @@ static const struct board_info __initcon
+       .name = "96368M-1541N",
+       .expected_cpu_id = 0x6368,
+@@ -2539,6 +2562,7 @@ static const struct board_info __initcon
        &board_HG622,
        &board_HG655b,
        &board_P870HW51A_V2,
@@ -38,7 +38,7 @@
        &board_VH4032N,
        &board_VR3025u,
        &board_VR3025un,
-@@ -2704,6 +2728,7 @@ static struct of_device_id const bcm963x
+@@ -2640,6 +2664,7 @@ static struct of_device_id const bcm963x
        { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
  #endif
  #ifdef CONFIG_BCM63XX_CPU_6368