From 0c109df7f02723b3cc59700ef15c1d19e0bcd0f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Fri, 7 Aug 2020 10:30:07 +0200 Subject: [PATCH] bcm63xx: merge RTA770BW and RTA770W board patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The only difference between both boards is the DSL annex. Signed-off-by: Álvaro Fernández Rojas --- ...patch => 531-board_rta770bw_rta770w.patch} | 9 ++-- .../bcm63xx/patches-5.4/532-board_hw556.patch | 2 +- .../patches-5.4/533-board_rta770w.patch | 43 ------------------- .../patches-5.4/534-board_fast2704.patch | 4 +- .../patches-5.4/535-board_fast2504n.patch | 6 +-- .../patches-5.4/536-board_96318ref.patch | 4 +- .../patches-5.4/537-board_96318ref_p300.patch | 4 +- .../patches-5.4/538-board_bcm963269bhr.patch | 6 +-- .../patches-5.4/539-board_AR1004G.patch | 6 +-- .../patches-5.4/540-board_vw6339gu.patch | 6 +-- .../patches-5.4/541-board_963268gu_p300.patch | 6 +-- .../patches-5.4/542-board_WAP-5813n.patch | 6 +-- .../patches-5.4/543-board_VR-3025u.patch | 6 +-- .../patches-5.4/544-board_VR-3025un.patch | 6 +-- .../patches-5.4/545-board_P870HW-51a_v2.patch | 6 +-- .../bcm63xx/patches-5.4/546-board_hw520.patch | 6 +-- .../patches-5.4/547-board_A4001N.patch | 4 +- .../patches-5.4/548-board_dsl-2751b_e1.patch | 4 +- .../549-board_DGND3700v1_3800B.patch | 6 +-- .../patches-5.4/550-board_homehub2a.patch | 6 +-- .../patches-5.4/551-board_HG655b.patch | 6 +-- .../patches-5.4/552-board_fast2704n.patch | 4 +- .../patches-5.4/553-board_VR-3026e.patch | 6 +-- .../patches-5.4/554-board_R5010UNv2.patch | 4 +- .../bcm63xx/patches-5.4/555-board_HG622.patch | 6 +-- .../patches-5.4/556-board_EVG2000.patch | 6 +-- .../patches-5.4/557-board_AV4202N.patch | 6 +-- .../patches-5.4/558-board_VH4032N.patch | 6 +-- .../patches-5.4/559-board_R1000H.patch | 6 +-- .../patches-5.4/560-board_AR-5315u.patch | 4 +- .../patches-5.4/561-board_AD1018.patch | 4 +- .../bcm63xx/patches-5.4/562-board_sr102.patch | 6 +-- .../patches-5.4/563-board-VR-3032u.patch | 6 +-- .../patches-5.4/564-board-DGND3700v2.patch | 6 +-- .../patches-5.4/565-board-VG-8050.patch | 6 +-- .../patches-5.4/566-board-HG253s-v2.patch | 6 +-- ...67-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 4 +- .../bcm63xx/patches-5.4/568-board-H500s.patch | 6 +-- 38 files changed, 101 insertions(+), 143 deletions(-) rename target/linux/bcm63xx/patches-5.4/{531-board_rta770bw.patch => 531-board_rta770bw_rta770w.patch} (76%) delete mode 100644 target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch similarity index 76% rename from target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch rename to target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch index 2d3e39b50ad..dcf53201218 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch @@ -5,7 +5,7 @@ .expected_cpu_id = 0x6345, }; + -+static struct board_info __initdata board_rta770bw = { ++static struct board_info __initdata board_rta770w = { + .name = "RTA770BW", + .expected_cpu_id = 0x6345, + @@ -24,15 +24,16 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -+ &board_rta770bw, ++ &board_rta770w, #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1323,6 +1337,7 @@ static struct of_device_id const bcm963x +@@ -1323,6 +1337,8 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, -+ { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, ++ { .compatible = "dynalink,rta770bw", .data = &board_rta770w, }, ++ { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 { .compatible = "belkin,f5d7633", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch index deab3073191..49d2858c7de 100644 --- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch @@ -113,7 +113,7 @@ &board_spw303v, &board_DVAG3810BN, #endif /* CONFIG_BCM63XX_CPU_6358 */ -@@ -1374,6 +1466,9 @@ static struct of_device_id const bcm963x +@@ -1375,6 +1467,9 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, { .compatible = "huawei,echolife-hg553", .data = &board_HW553, }, diff --git a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch deleted file mode 100644 index ce6cda7721a..00000000000 --- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -420,6 +420,24 @@ static struct board_info __initdata boar - .force_duplex_full = 1, - }, - }; -+ -+// Actually this board is the very same as the rta770bw, -+// where the additional 'b' within the name just -+// just indicates 'Annex B'. The ADSL Modem itself is able -+// to handle both Annex A as well as Annex B - -+// the loaded firmware makes the only difference -+static struct board_info __initdata board_rta770w = { -+ .name = "RTA770W", -+ .expected_cpu_id = 0x6345, -+ -+ .has_enet0 = 1, -+ .enet0 = { -+ .has_phy = 1, -+ .phy_id = 0, -+ .force_speed_100 = 1, -+ .force_duplex_full = 1, -+ }, -+}; - #endif /* CONFIG_BCM63XX_CPU_6345 */ - - /* -@@ -1359,6 +1377,7 @@ static const struct board_info __initcon - #ifdef CONFIG_BCM63XX_CPU_6345 - &board_96345gw2, - &board_rta770bw, -+ &board_rta770w, - #endif /* CONFIG_BCM63XX_CPU_6345 */ - #ifdef CONFIG_BCM63XX_CPU_6348 - &board_96348r, -@@ -1430,6 +1449,7 @@ static struct of_device_id const bcm963x - #ifdef CONFIG_BCM63XX_CPU_6345 - { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, - { .compatible = "dynalink,rta770bw", .data = &board_rta770bw, }, -+ { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, - #endif - #ifdef CONFIG_BCM63XX_CPU_6348 - { .compatible = "belkin,f5d7633", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch index fde3b601f66..6071c8bbdd4 100644 --- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch @@ -55,7 +55,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1367,6 +1403,7 @@ static const struct board_info __initcon +@@ -1349,6 +1385,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, @@ -63,7 +63,7 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1439,6 +1476,7 @@ static struct of_device_id const bcm963x +@@ -1420,6 +1457,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch index 5974e9a159d..13063604a70 100644 --- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch +++ b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch @@ -6,7 +6,7 @@ Signed-off-by: Max Staudt --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1306,6 +1306,37 @@ static struct board_info __initdata boar +@@ -1288,6 +1288,37 @@ static struct board_info __initdata boar }, }, }; @@ -44,7 +44,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1457,6 +1488,7 @@ static const struct board_info __initcon +@@ -1438,6 +1469,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -52,7 +52,7 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, -@@ -1537,6 +1569,7 @@ static struct of_device_id const bcm963x +@@ -1518,6 +1550,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch index 46955477382..17cf1d1fba2 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch @@ -54,7 +54,7 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1427,6 +1474,9 @@ static const struct board_info __initcon +@@ -1409,6 +1456,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, #endif /* CONFIG_BCM63XX_CPU_3368 */ @@ -64,7 +64,7 @@ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1501,6 +1551,9 @@ static struct of_device_id const bcm963x +@@ -1482,6 +1532,9 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_3368 { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch index d585759707b..3abb9644c56 100644 --- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1476,6 +1518,7 @@ static const struct board_info __initcon +@@ -1458,6 +1500,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1553,6 +1596,7 @@ static struct of_device_id const bcm963x +@@ -1534,6 +1577,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch index d7a3484a3bc..d3b1c79cfd4 100644 --- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch +++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1510,6 +1510,46 @@ static struct board_info __initdata boar +@@ -1492,6 +1492,46 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -47,7 +47,7 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1587,6 +1627,9 @@ static const struct board_info __initcon +@@ -1568,6 +1608,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ @@ -57,7 +57,7 @@ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1674,6 +1717,7 @@ static struct of_device_id const bcm963x +@@ -1655,6 +1698,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch index 07594670b1c..34cc2555eb6 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch @@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks --- --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -635,6 +635,21 @@ static struct board_info __initdata boar +@@ -617,6 +617,21 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -30,7 +30,7 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { .name = "V2110", -@@ -1601,6 +1616,7 @@ static const struct board_info __initcon +@@ -1582,6 +1597,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, @@ -38,7 +38,7 @@ Signed-off-by: Adrian Feliks #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 &board_96358vw, -@@ -1662,6 +1678,7 @@ static struct of_device_id const bcm963x +@@ -1643,6 +1659,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta770w", .data = &board_rta770w, }, #endif #ifdef CONFIG_BCM63XX_CPU_6348 diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch index 34305061fc6..4e6ea9dcd9c 100644 --- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch +++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1562,6 +1562,48 @@ static struct board_info __initdata boar +@@ -1544,6 +1544,48 @@ static struct board_info __initdata boar }, }, }; @@ -49,7 +49,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1645,6 +1687,7 @@ static const struct board_info __initcon +@@ -1626,6 +1668,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -1735,6 +1778,7 @@ static struct of_device_id const bcm963x +@@ -1716,6 +1759,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch index 3ac749e00b3..ec0642d3585 100644 --- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch +++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1528,6 +1528,65 @@ static struct board_info __initdata boar +@@ -1510,6 +1510,65 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -66,7 +66,7 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1686,6 +1745,7 @@ static const struct board_info __initcon +@@ -1667,6 +1726,7 @@ static const struct board_info __initcon &board_96368mvngr, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -74,7 +74,7 @@ &board_963269bhr, &board_vw6339gu, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -1777,6 +1837,7 @@ static struct of_device_id const bcm963x +@@ -1758,6 +1818,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, #endif #ifdef CONFIG_BCM63XX_CPU_63268 diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch index 0a76ae16f3a..9b31e5bca8b 100644 --- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch +++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch @@ -9,7 +9,7 @@ #include #include #include -@@ -1522,6 +1524,47 @@ static struct board_info __initdata boar +@@ -1504,6 +1506,47 @@ static struct board_info __initdata boar }, }, }; @@ -57,7 +57,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1743,6 +1786,7 @@ static const struct board_info __initcon +@@ -1724,6 +1767,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -65,7 +65,7 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1835,6 +1879,7 @@ static struct of_device_id const bcm963x +@@ -1816,6 +1860,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch index d81264f4e3b..a12ff5f29dd 100644 --- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch +++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1525,6 +1525,59 @@ static struct board_info __initdata boar +@@ -1507,6 +1507,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1786,6 +1839,7 @@ static const struct board_info __initcon +@@ -1767,6 +1820,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1879,6 +1933,7 @@ static struct of_device_id const bcm963x +@@ -1860,6 +1914,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6368 { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch index c62ee0e67b9..095c96be7b4 100644 --- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch +++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1578,6 +1578,59 @@ static struct board_info __initdata boar +@@ -1560,6 +1560,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1840,6 +1893,7 @@ static const struct board_info __initcon +@@ -1821,6 +1874,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1934,6 +1988,7 @@ static struct of_device_id const bcm963x +@@ -1915,6 +1969,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, }, { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch index 285703be707..23599a93201 100644 --- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch +++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1534,6 +1534,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1516,6 +1516,48 @@ static struct sprom_fixup __initdata vr3 { .offset = 115, .value = 0xfad9 }, }; @@ -49,7 +49,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -1892,6 +1934,7 @@ static const struct board_info __initcon +@@ -1873,6 +1915,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -57,7 +57,7 @@ &board_VR3025u, &board_VR3025un, &board_WAP5813n, -@@ -1990,6 +2033,7 @@ static struct of_device_id const bcm963x +@@ -1971,6 +2014,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch index 59601ebac53..a29f9bd5732 100644 --- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch +++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1236,6 +1236,36 @@ static struct board_info __initdata boar +@@ -1218,6 +1218,36 @@ static struct board_info __initdata boar }, }; @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1920,6 +1950,7 @@ static const struct board_info __initcon +@@ -1901,6 +1931,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -45,7 +45,7 @@ &board_HW553, &board_HW556_A, &board_HW556_B, -@@ -2010,6 +2041,7 @@ static struct of_device_id const bcm963x +@@ -1991,6 +2022,7 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, { .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, }, diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch index 26550644548..303cdbfd0b7 100644 --- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch +++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -1902,6 +1945,7 @@ static const struct board_info __initcon +@@ -1884,6 +1927,7 @@ static const struct board_info __initcon &board_AR5381u, &board_AR5387un, &board_963281TAN, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -1987,6 +2031,7 @@ static struct of_device_id const bcm963x +@@ -1968,6 +2012,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch index 5b739ebe647..6b27bf9f5bf 100644 --- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch +++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch @@ -73,7 +73,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1939,6 +2005,7 @@ static const struct board_info __initcon +@@ -1921,6 +1987,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -81,7 +81,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2029,6 +2096,7 @@ static struct of_device_id const bcm963x +@@ -2010,6 +2077,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch index c355cfbccfe..1ceb59db78a 100644 --- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch +++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1664,6 +1664,30 @@ static struct board_info __initdata boar +@@ -1646,6 +1646,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2076,6 +2100,7 @@ static const struct board_info __initcon +@@ -2057,6 +2081,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, @@ -39,7 +39,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2178,6 +2203,7 @@ static struct of_device_id const bcm963x +@@ -2159,6 +2184,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch index d06a4c5dab9..25d644fa8d6 100644 --- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch +++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1345,6 +1345,31 @@ static struct board_info __initdata boar +@@ -1327,6 +1327,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_HW520 = { .name = "HW6358GW_B", .expected_cpu_id = 0x6358, -@@ -2085,6 +2110,7 @@ static const struct board_info __initcon +@@ -2066,6 +2091,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_ct6373_1, @@ -40,7 +40,7 @@ &board_HW520, &board_HW553, &board_HW556_A, -@@ -2192,6 +2218,7 @@ static struct of_device_id const bcm963x +@@ -2173,6 +2199,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, diff --git a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch index cc298851a66..2678534a602 100644 --- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch +++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1713,6 +1713,52 @@ static struct board_info __initdata boar +@@ -1695,6 +1695,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2127,6 +2173,7 @@ static const struct board_info __initcon +@@ -2108,6 +2154,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, -@@ -2230,6 +2277,7 @@ static struct of_device_id const bcm963x +@@ -2211,6 +2258,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch index e7b6a21fb2c..06d8391590f 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -50,7 +50,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2101,6 +2144,7 @@ static const struct board_info __initcon +@@ -2083,6 +2126,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, @@ -58,7 +58,7 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2195,6 +2239,7 @@ static struct of_device_id const bcm963x +@@ -2176,6 +2220,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, { .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, }, diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch index 37538155851..5b9973932b1 100644 --- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch +++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1950,6 +1950,59 @@ static struct board_info __initdata boar +@@ -1932,6 +1932,59 @@ static struct board_info __initdata boar }, }; @@ -60,7 +60,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2221,6 +2274,7 @@ static const struct board_info __initcon +@@ -2202,6 +2255,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, @@ -68,7 +68,7 @@ &board_WAP5813n, #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2321,6 +2375,7 @@ static struct of_device_id const bcm963x +@@ -2302,6 +2356,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, }, { .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, }, { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch index bf60aa0200c..de787cb705d 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2208,6 +2252,7 @@ static const struct board_info __initcon +@@ -2190,6 +2234,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, @@ -59,7 +59,7 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2303,6 +2348,7 @@ static struct of_device_id const bcm963x +@@ -2284,6 +2329,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, }, { .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, }, { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch index c279210f2d4..13b26fc35ea 100644 --- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch +++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1846,6 +1846,52 @@ static struct board_info __initdata boar +@@ -1828,6 +1828,52 @@ static struct board_info __initdata boar }, }; @@ -53,7 +53,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2315,6 +2361,7 @@ static const struct board_info __initcon +@@ -2296,6 +2342,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -61,7 +61,7 @@ &board_HG655b, &board_P870HW51A_V2, &board_VR3025u, -@@ -2423,6 +2470,7 @@ static struct of_device_id const bcm963x +@@ -2404,6 +2451,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, }, { .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, }, { .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, }, diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch index 51e6faf09bc..6337419a9a1 100644 --- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch +++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1800,6 +1800,43 @@ static struct board_info __initdata boar +@@ -1782,6 +1782,43 @@ static struct board_info __initdata boar }, }; @@ -44,7 +44,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2361,6 +2398,7 @@ static const struct board_info __initcon +@@ -2342,6 +2379,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -52,7 +52,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2473,6 +2511,7 @@ static struct of_device_id const bcm963x +@@ -2454,6 +2492,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg622", .data = &board_HG622, }, { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch index e8e891be99b..02c48d7d710 100644 --- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch +++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1700,6 +1700,49 @@ static struct board_info __initdata boar +@@ -1682,6 +1682,49 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -50,7 +50,7 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2395,6 +2438,7 @@ static const struct board_info __initcon +@@ -2376,6 +2419,7 @@ static const struct board_info __initcon &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -58,7 +58,7 @@ &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2502,6 +2546,7 @@ static struct of_device_id const bcm963x +@@ -2483,6 +2527,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch index 19f9ef73f7a..4de5aff6a87 100644 --- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch +++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2173,6 +2173,106 @@ static struct board_info __initdata boar +@@ -2155,6 +2155,106 @@ static struct board_info __initdata boar }, }; @@ -107,7 +107,7 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2446,6 +2546,7 @@ static const struct board_info __initcon +@@ -2427,6 +2527,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2557,6 +2658,7 @@ static struct of_device_id const bcm963x +@@ -2538,6 +2639,7 @@ static struct of_device_id const bcm963x { .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, }, { .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, }, { .compatible = "netgear,evg2000", .data = &board_EVG2000, }, 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 ae1a748ae79..570ace245c5 100644 --- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch +++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2023,6 +2023,29 @@ static struct board_info __initdata boar +@@ -2005,6 +2005,29 @@ static struct board_info __initdata boar }, }; @@ -30,7 +30,7 @@ static struct board_info __initdata board_VR3025u = { .name = "96368M-1541N", .expected_cpu_id = 0x6368, -@@ -2546,6 +2569,7 @@ static const struct board_info __initcon +@@ -2527,6 +2550,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2647,6 +2671,7 @@ static struct of_device_id const bcm963x +@@ -2628,6 +2652,7 @@ static struct of_device_id const bcm963x { .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch index 640ee59ec37..9315b556b79 100644 --- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch +++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch @@ -66,7 +66,7 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2489,6 +2548,7 @@ static const struct board_info __initcon +@@ -2471,6 +2530,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, @@ -74,7 +74,7 @@ &board_dsl_2751b_d1, &board_FAST2704N, #endif /* CONFIG_BCM63XX_CPU_6318 */ -@@ -2591,6 +2651,7 @@ static struct of_device_id const bcm963x +@@ -2572,6 +2632,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6318 { .compatible = "brcm,bcm96318ref", .data = &board_96318ref, }, { .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, }, diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch index 28a0a7b4687..8c62a9c16d3 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -72,7 +72,7 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2554,6 +2619,7 @@ static const struct board_info __initcon +@@ -2536,6 +2601,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, @@ -80,7 +80,7 @@ &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2665,6 +2731,8 @@ static struct of_device_id const bcm963x +@@ -2646,6 +2712,8 @@ static struct of_device_id const bcm963x { .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, }, { .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, }, { .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, }, diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch index 6c9a05c9d8d..3ac5aef937c 100644 --- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch +++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2601,6 +2601,42 @@ static struct board_info __initdata boar +@@ -2583,6 +2583,42 @@ static struct board_info __initdata boar }, }, }; @@ -43,7 +43,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2706,6 +2742,7 @@ static const struct board_info __initcon +@@ -2687,6 +2723,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, @@ -51,7 +51,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2819,6 +2856,7 @@ static struct of_device_id const bcm963x +@@ -2800,6 +2837,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch index 5df94067a9d..c40b23fdb8d 100644 --- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch +++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2560,6 +2560,41 @@ static struct board_info __initdata boar +@@ -2542,6 +2542,41 @@ static struct board_info __initdata boar }, }; @@ -42,7 +42,7 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2741,6 +2776,7 @@ static const struct board_info __initcon +@@ -2722,6 +2757,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -50,7 +50,7 @@ &board_vw6339gu, &board_BSKYB_63168, #endif /* CONFIG_BCM63XX_CPU_63268 */ -@@ -2855,6 +2891,7 @@ static struct of_device_id const bcm963x +@@ -2836,6 +2872,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch index 74739baf9fb..de37a8b7091 100644 --- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch +++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1788,6 +1788,30 @@ static struct board_info __initdata boar +@@ -1770,6 +1770,30 @@ static struct board_info __initdata boar }, }; @@ -31,7 +31,7 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2755,6 +2779,7 @@ static const struct board_info __initcon +@@ -2736,6 +2760,7 @@ static const struct board_info __initcon #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, @@ -39,7 +39,7 @@ &board_fast2504n, #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2869,6 +2894,7 @@ static struct of_device_id const bcm963x +@@ -2850,6 +2875,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch index 0cf2fbb3249..fa0cd6aef03 100644 --- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch +++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2584,6 +2584,31 @@ static struct board_info __initdata boar +@@ -2566,6 +2566,31 @@ static struct board_info __initdata boar }, }; @@ -32,7 +32,7 @@ static struct board_info __initdata board_VR3032u = { .name = "963168M-1841N1", .expected_cpu_id = 0x63268, -@@ -2801,6 +2826,7 @@ static const struct board_info __initcon +@@ -2782,6 +2807,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, @@ -40,7 +40,7 @@ &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, -@@ -2917,6 +2943,7 @@ static struct of_device_id const bcm963x +@@ -2898,6 +2924,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_63268 { .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, }, { .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, }, diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch index 8fd559fdb98..80ce2d38531 100644 --- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch +++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -1842,6 +1842,37 @@ static struct board_info __initdata boar +@@ -1824,6 +1824,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,7 +38,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2806,6 +2837,7 @@ static const struct board_info __initcon +@@ -2787,6 +2818,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, @@ -46,7 +46,7 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_AV4202N, -@@ -2920,6 +2952,7 @@ static struct of_device_id const bcm963x +@@ -2901,6 +2933,7 @@ static struct of_device_id const bcm963x { .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, }, #endif #ifdef CONFIG_BCM63XX_CPU_6362 diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch index 04d70d59ac9..dec14545fe3 100644 --- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch +++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch @@ -50,7 +50,7 @@ static struct board_info __initdata board_A4001N1 = { .name = "963281T_TEF", .expected_cpu_id = 0x6328, -@@ -2775,6 +2818,7 @@ static const struct board_info __initcon +@@ -2757,6 +2800,7 @@ static const struct board_info __initcon &board_AR5387un, &board_963281TAN, &board_A4001N, @@ -58,7 +58,7 @@ &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, -@@ -2880,6 +2924,7 @@ static struct of_device_id const bcm963x +@@ -2861,6 +2905,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "adb,a4001n", .data = &board_A4001N, }, { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch index c719ef556a1..a2c08a78f54 100644 --- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch +++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -2795,6 +2795,36 @@ static struct board_info __initdata boar +@@ -2777,6 +2777,36 @@ static struct board_info __initdata boar }, }, }; @@ -37,7 +37,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2906,6 +2936,7 @@ static const struct board_info __initcon +@@ -2887,6 +2917,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, @@ -45,7 +45,7 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3024,6 +3055,8 @@ static struct of_device_id const bcm963x +@@ -3005,6 +3036,8 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,vg-8050", .data = &board_VG8050, }, { .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, }, { .compatible = "inteno,vg50", .data = &board_vw6339gu, }, -- 2.30.2