From f41a40001af80ff73415e3617655b1fc85c8171f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 6 Aug 2020 16:12:21 +0200 Subject: [PATCH] bcm63xx: switch to upstream endif comments patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This allows better context for board patches and we no longer need a downstream patch for that. Signed-off-by: Álvaro Fernández Rojas --- ...v5.9-MIPS-BCM63xx-add-endif-comments.patch | 155 ++++++++++++++++++ ...ister-OHCI-controller-if-board-enabl.patch | 2 +- ...ister-EHCI-controller-if-board-enabl.patch | 2 +- ...e-device-registration-code-into-its-.patch | 14 +- ...s-a-mac-addresss-allocator-to-board-.patch | 2 +- .../patches-5.4/309-cfe_version_mod.patch | 2 +- ...22-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch | 2 +- ...IPS-BCM63XX-add-support-for-BCM63268.patch | 2 +- ...MIPS-BCM63XX-add-support-for-BCM6318.patch | 2 +- .../351-set-board-usbh-ports.patch | 2 +- ...ow-building-support-for-more-than-on.patch | 2 +- ...BCM63XX-make-fallback-sprom-optional.patch | 10 +- ...-support-for-matching-the-board_info.patch | 8 +- ...ulate-the-compatible-to-board_info-l.patch | 2 +- ...-register-lookup-for-ephy-reset-gpio.patch | 2 +- ...91-MIPS-BCM63XX-do-not-register-uart.patch | 12 +- ...MIPS-BCM63XX-remove-leds-and-buttons.patch | 8 +- .../patches-5.4/427-boards_probe_switch.patch | 12 +- ...low_better_context_for_board_patches.patch | 56 ------- .../bcm63xx/patches-5.4/500-board-D4PW.patch | 10 +- .../bcm63xx/patches-5.4/501-board-NB4.patch | 8 +- .../patches-5.4/502-board-96338W2_E7T.patch | 6 +- .../patches-5.4/503-board-CPVA642.patch | 6 +- .../504-board_dsl_274xb_rev_c.patch | 8 +- .../patches-5.4/505-board_spw500v.patch | 10 +- .../patches-5.4/506-board_gw6200_gw6000.patch | 4 +- .../bcm63xx/patches-5.4/507-board-MAGIC.patch | 10 +- .../bcm63xx/patches-5.4/508-board_hw553.patch | 8 +- .../patches-5.4/509-board_rta1320_16m.patch | 6 +- .../patches-5.4/510-board_spw303v.patch | 8 +- .../patches-5.4/511-board_V2500V.patch | 12 +- .../patches-5.4/512-board_BTV2110.patch | 8 +- .../patches-5.4/514-board_ct536_ct5621.patch | 8 +- .../patches-5.4/515-board_DWV-S0_fixes.patch | 2 +- .../patches-5.4/516-board_96348A-122.patch | 8 +- .../patches-5.4/517_board_CPVA502plus.patch | 8 +- ...63xx-add-support-for-96368MVWG-board.patch | 11 +- ...3xx-add-support-for-96368MVNgr-board.patch | 10 +- ...CM63XX-add-963281TAN-reference-board.patch | 8 +- .../522-board_dsl_274xb_rev_f.patch | 6 +- .../patches-5.4/523-board_96348w3.patch | 10 +- .../patches-5.4/524-board_CT6373-1.patch | 8 +- .../525-board_dva-g3810bn-tl-1.patch | 10 +- .../bcm63xx/patches-5.4/526-board_nb6.patch | 13 +- .../patches-5.4/527-board_fast2604.patch | 4 +- .../patches-5.4/528-board_A4001N1.patch | 6 +- .../patches-5.4/529-board_AR-5387un.patch | 6 +- .../patches-5.4/530-board_AR-5381u.patch | 6 +- .../patches-5.4/531-board_rta770bw.patch | 8 +- .../bcm63xx/patches-5.4/532-board_hw556.patch | 8 +- .../patches-5.4/533-board_rta770w.patch | 6 +- .../patches-5.4/534-board_fast2704.patch | 6 +- .../patches-5.4/535-board_fast2504n.patch | 12 +- .../patches-5.4/536-board_96318ref.patch | 8 +- .../patches-5.4/537-board_96318ref_p300.patch | 8 +- .../patches-5.4/538-board_bcm963269bhr.patch | 10 +- .../patches-5.4/539-board_AR1004G.patch | 8 +- .../patches-5.4/540-board_vw6339gu.patch | 10 +- .../patches-5.4/541-board_963268gu_p300.patch | 10 +- .../patches-5.4/542-board_WAP-5813n.patch | 8 +- .../patches-5.4/543-board_VR-3025u.patch | 8 +- .../patches-5.4/544-board_VR-3025un.patch | 8 +- .../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 | 6 +- .../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 | 6 +- .../patches-5.4/553-board_VR-3026e.patch | 8 +- .../patches-5.4/554-board_R5010UNv2.patch | 6 +- .../bcm63xx/patches-5.4/555-board_HG622.patch | 6 +- .../patches-5.4/556-board_EVG2000.patch | 6 +- .../patches-5.4/557-board_AV4202N.patch | 10 +- .../patches-5.4/558-board_VH4032N.patch | 6 +- .../patches-5.4/559-board_R1000H.patch | 6 +- .../patches-5.4/560-board_AR-5315u.patch | 6 +- .../patches-5.4/561-board_AD1018.patch | 6 +- .../bcm63xx/patches-5.4/562-board_sr102.patch | 8 +- .../patches-5.4/563-board-VR-3032u.patch | 8 +- .../patches-5.4/564-board-DGND3700v2.patch | 12 +- .../patches-5.4/565-board-VG-8050.patch | 6 +- .../patches-5.4/566-board-HG253s-v2.patch | 10 +- ...67-board-adb_pdg-a4001n-a-000-1a1-ax.patch | 4 +- .../bcm63xx/patches-5.4/568-board-H500s.patch | 8 +- 86 files changed, 451 insertions(+), 354 deletions(-) create mode 100644 target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch delete mode 100644 target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch diff --git a/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch new file mode 100644 index 0000000000..bb56363e39 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch @@ -0,0 +1,155 @@ +From c425423a075718eac625c78351fa5907d4f3a9de Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Mon, 8 Jun 2020 12:18:28 +0200 +Subject: [PATCH] MIPS: BCM63xx: add endif comments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are plenty of ifdefs in board_bcm963xx.c without endif comments. +Let's make the code easier to follow by adding proper comments. + +Signed-off-by: Álvaro Fernández Rojas +Signed-off-by: Thomas Bogendoerfer +--- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 33 +++++++++++------------ + 1 file changed, 15 insertions(+), 18 deletions(-) + +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -67,7 +67,7 @@ static struct board_info __initdata boar + .ephy_reset_gpio = 36, + .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_3368 */ + + /* + * known 6328 boards +@@ -115,7 +115,7 @@ static struct board_info __initdata boar + }, + }, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6328 */ + + /* + * known 6338 boards +@@ -204,7 +204,7 @@ static struct board_info __initdata boar + }, + }, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6338 */ + + /* + * known 6345 boards +@@ -216,7 +216,7 @@ static struct board_info __initdata boar + + .has_uart0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6345 */ + + /* + * known 6348 boards +@@ -464,7 +464,6 @@ static struct board_info __initdata boar + }, + }; + +- + static struct board_info __initdata board_DV201AMR = { + .name = "DV201AMR", + .expected_cpu_id = 0x6348, +@@ -505,7 +504,7 @@ static struct board_info __initdata boar + + .has_ohci0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6348 */ + + /* + * known 6358 boards +@@ -530,7 +529,6 @@ static struct board_info __initdata boar + .force_duplex_full = 1, + }, + +- + .has_ohci0 = 1, + .has_pccard = 1, + .has_ehci0 = 1, +@@ -654,7 +652,7 @@ static struct board_info __initdata boar + + .has_ohci0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6358 */ + + /* + * all boards +@@ -662,17 +660,17 @@ static struct board_info __initdata boar + static const struct board_info __initconst *bcm963xx_boards[] = { + #ifdef CONFIG_BCM63XX_CPU_3368 + &board_cvg834g, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_3368 */ + #ifdef CONFIG_BCM63XX_CPU_6328 + &board_96328avng, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6328 */ + #ifdef CONFIG_BCM63XX_CPU_6338 + &board_96338gw, + &board_96338w, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6338 */ + #ifdef CONFIG_BCM63XX_CPU_6345 + &board_96345gw2, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6345 */ + #ifdef CONFIG_BCM63XX_CPU_6348 + &board_96348r, + &board_96348gw, +@@ -682,14 +680,13 @@ static const struct board_info __initcon + &board_DV201AMR, + &board_96348gw_a, + &board_rta1025w_16, +-#endif +- ++#endif /* CONFIG_BCM63XX_CPU_6348 */ + #ifdef CONFIG_BCM63XX_CPU_6358 + &board_96358vw, + &board_96358vw2, + &board_AGPFS0, + &board_DWVS0, +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6358 */ + }; + + /* +@@ -728,7 +725,7 @@ int bcm63xx_get_fallback_sprom(struct ss + return -EINVAL; + } + } +-#endif ++#endif /* CONFIG_SSB_PCIHOST */ + + /* + * return board name for /proc/cpuinfo +@@ -807,7 +804,7 @@ void __init board_prom_init(void) + if (BCMCPU_IS_6348()) + val |= GPIO_MODE_6348_G2_PCI; + } +-#endif ++#endif /* CONFIG_PCI */ + + if (board.has_pccard) { + if (BCMCPU_IS_6348()) +@@ -892,7 +889,7 @@ int __init board_register_devices(void) + &bcm63xx_get_fallback_sprom) < 0) + pr_err("failed to register fallback SPROM\n"); + } +-#endif ++#endif /* CONFIG_SSB_PCIHOST */ + + bcm63xx_spi_register(); + diff --git a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch index 6fc5551884..80427d7fd3 100644 --- a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch +++ b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch @@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli #include #include -@@ -881,6 +882,9 @@ int __init board_register_devices(void) +@@ -878,6 +879,9 @@ int __init board_register_devices(void) if (board.has_usbd) bcm63xx_usbd_register(&board.usbd); diff --git a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch index 3db82bb483..e8c2588b67 100644 --- a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch +++ b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch @@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli #include #include #include -@@ -882,6 +883,9 @@ int __init board_register_devices(void) +@@ -879,6 +880,9 @@ int __init board_register_devices(void) if (board.has_usbd) bcm63xx_usbd_register(&board.usbd); diff --git a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch index 652eb6c9bf..f39c9a8122 100644 --- a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch +++ b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch @@ -61,7 +61,7 @@ Signed-off-by: Jonas Gorski /* * known 3368 boards */ -@@ -695,52 +683,6 @@ static const struct board_info __initcon +@@ -692,52 +680,6 @@ static const struct board_info __initcon }; /* @@ -100,7 +100,7 @@ Signed-off-by: Jonas Gorski - return -EINVAL; - } -} --#endif +-#endif /* CONFIG_SSB_PCIHOST */ - -/* - * return board name for /proc/cpuinfo @@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski * early init callback, read nvram data from flash and checksum it */ void __init board_prom_init(void) -@@ -785,137 +727,15 @@ void __init board_prom_init(void) +@@ -782,137 +724,15 @@ void __init board_prom_init(void) if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) continue; /* copy, board desc array is marked initdata */ @@ -144,8 +144,8 @@ Signed-off-by: Jonas Gorski - bcm63xx_pci_enabled = 1; - if (BCMCPU_IS_6348()) - val |= GPIO_MODE_6348_G2_PCI; - } --#endif +- } +-#endif /* CONFIG_PCI */ - - if (board.has_pccard) { - if (BCMCPU_IS_6348()) @@ -235,8 +235,8 @@ Signed-off-by: Jonas Gorski - if (ssb_arch_register_fallback_sprom( - &bcm63xx_get_fallback_sprom) < 0) - pr_err("failed to register fallback SPROM\n"); -- } --#endif + } +-#endif /* CONFIG_SSB_PCIHOST */ - - bcm63xx_spi_register(); - diff --git a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch index 7f9479b825..f34e222314 100644 --- a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch +++ b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch @@ -17,7 +17,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -727,7 +727,8 @@ void __init board_prom_init(void) +@@ -724,7 +724,8 @@ void __init board_prom_init(void) if (strncmp(board_name, bcm963xx_boards[i]->name, 16)) continue; /* copy, board desc array is marked initdata */ diff --git a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch index fe6c6d2909..3a0d08074d 100644 --- a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch +++ b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -707,10 +707,20 @@ void __init board_prom_init(void) +@@ -704,10 +704,20 @@ void __init board_prom_init(void) /* dump cfe version */ cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; diff --git a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch index ec978a031d..8f50dd689b 100644 --- a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch +++ b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -290,6 +290,9 @@ config BCM63XX +@@ -291,6 +291,9 @@ config BCM63XX select SYNC_R4K select DMA_NONCOHERENT select IRQ_MIPS_CPU diff --git a/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch index aba4b9415a..b1831026d4 100644 --- a/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch +++ b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski source "arch/mips/bcm63xx/boards/Kconfig" --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -697,7 +697,7 @@ void __init board_prom_init(void) +@@ -694,7 +694,7 @@ void __init board_prom_init(void) /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address */ diff --git a/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch index a022f8c5f0..c297321b64 100644 --- a/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch +++ b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch @@ -35,7 +35,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318 select SYS_HAS_CPU_BMIPS4350 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -697,7 +697,7 @@ void __init board_prom_init(void) +@@ -694,7 +694,7 @@ void __init board_prom_init(void) /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address */ diff --git a/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch index 531adc9f1b..2543ad7922 100644 --- a/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch +++ b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -576,6 +576,7 @@ static struct board_info __initdata boar +@@ -574,6 +574,7 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, diff --git a/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch index 51908d99d2..6301f73bca 100644 --- a/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch +++ b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski +endmenu --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -686,7 +686,7 @@ static const struct board_info __initcon +@@ -683,7 +683,7 @@ static const struct board_info __initcon /* * early init callback, read nvram data from flash and checksum it */ diff --git a/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch index f540eabeff..170578f8bc 100644 --- a/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch +++ b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch @@ -74,7 +74,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -461,6 +468,7 @@ static struct board_info __initdata boar +@@ -460,6 +467,7 @@ static struct board_info __initdata boar .has_uart0 = 1, .has_pci = 1, @@ -82,7 +82,7 @@ Signed-off-by: Jonas Gorski .has_ohci0 = 1, .has_enet0 = 1, -@@ -483,6 +491,7 @@ static struct board_info __initdata boar +@@ -482,6 +490,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, @@ -90,7 +90,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -509,6 +518,7 @@ static struct board_info __initdata boar +@@ -508,6 +517,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, @@ -98,7 +98,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -561,6 +571,7 @@ static struct board_info __initdata boar +@@ -559,6 +569,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, @@ -106,7 +106,7 @@ Signed-off-by: Jonas Gorski .enet0 = { .has_phy = 1, -@@ -632,6 +643,7 @@ static struct board_info __initdata boar +@@ -630,6 +641,7 @@ static struct board_info __initdata boar .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, diff --git a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch index 7069c231de..db30de2183 100644 --- a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch +++ b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch @@ -16,8 +16,8 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -695,6 +695,10 @@ static const struct board_info __initcon - #endif +@@ -692,6 +692,10 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; +static struct of_device_id const bcm963xx_boards_dt[] = { @@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski /* * early init callback, read nvram data from flash and checksum it */ -@@ -706,6 +710,7 @@ void __init board_bcm963xx_init(void) +@@ -703,6 +707,7 @@ void __init board_bcm963xx_init(void) char *board_name = NULL; u32 val; struct bcm_hcs *hcs; @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address -@@ -745,6 +750,16 @@ void __init board_bcm963xx_init(void) +@@ -742,6 +747,16 @@ void __init board_bcm963xx_init(void) } else { board_name = bcm63xx_nvram_get_name(); } diff --git a/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch index 5dd4cbaeec..d002b09f3d 100644 --- a/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch +++ b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -696,6 +696,48 @@ static const struct board_info __initcon +@@ -693,6 +693,48 @@ static const struct board_info __initcon }; static struct of_device_id const bcm963xx_boards_dt[] = { diff --git a/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch index c061ec4e60..890f326bf4 100644 --- a/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch +++ b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch @@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski - .ephy_reset_gpio_flags = GPIOF_INIT_HIGH, + .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_3368 */ --- a/arch/mips/bcm63xx/boards/board_common.c +++ b/arch/mips/bcm63xx/boards/board_common.c diff --git a/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch index e9d4481d14..bab5bbee6f 100644 --- a/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch +++ b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch @@ -175,7 +175,7 @@ - - .has_uart0 = 1, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ @@ -217,7 +209,6 @@ static struct board_info __initdata boar .name = "96348R", @@ -217,7 +217,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -466,7 +453,6 @@ static struct board_info __initdata boar +@@ -465,7 +452,6 @@ static struct board_info __initdata boar .name = "DV201AMR", .expected_cpu_id = 0x6348, @@ -225,7 +225,7 @@ .has_pci = 1, .use_fallback_sprom = 1, .has_ohci0 = 1, -@@ -487,7 +473,6 @@ static struct board_info __initdata boar +@@ -486,7 +472,6 @@ static struct board_info __initdata boar .name = "96348GW-A", .expected_cpu_id = 0x6348, @@ -233,7 +233,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -514,7 +499,6 @@ static struct board_info __initdata boar +@@ -513,7 +498,6 @@ static struct board_info __initdata boar .name = "96358VW", .expected_cpu_id = 0x6358, @@ -241,7 +241,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -567,7 +551,6 @@ static struct board_info __initdata boar +@@ -565,7 +549,6 @@ static struct board_info __initdata boar .name = "96358VW2", .expected_cpu_id = 0x6358, @@ -249,7 +249,7 @@ .has_enet0 = 1, .has_enet1 = 1, .has_pci = 1, -@@ -617,7 +600,6 @@ static struct board_info __initdata boar +@@ -615,7 +598,6 @@ static struct board_info __initdata boar .name = "AGPF-S0", .expected_cpu_id = 0x6358, diff --git a/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch index e1394267b5..8aaf093dff 100644 --- a/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch +++ b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch @@ -58,7 +58,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons - }, - }, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ @@ -119,35 +82,6 @@ static struct board_info __initdata boar }, @@ -130,7 +130,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons - }, - }, }; - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ @@ -217,36 +122,6 @@ static struct board_info __initdata boar .has_phy = 1, @@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_FAST2404 = { -@@ -518,33 +306,6 @@ static struct board_info __initdata boar +@@ -516,33 +304,6 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_pccard = 1, .has_ehci0 = 1, @@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons }; static struct board_info __initdata board_96358vw2 = { -@@ -571,29 +332,6 @@ static struct board_info __initdata boar +@@ -569,29 +330,6 @@ static struct board_info __initdata boar .has_pccard = 1, .has_ehci0 = 1, .num_usbh_ports = 2, diff --git a/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch index 4b206a259e..0c00ff0da7 100644 --- a/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch +++ b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch @@ -63,7 +63,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -252,6 +266,8 @@ static struct board_info __initdata boar +@@ -251,6 +265,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -72,7 +72,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -271,6 +287,8 @@ static struct board_info __initdata boar +@@ -270,6 +286,8 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, .enet1 = { @@ -81,7 +81,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -298,6 +316,8 @@ static struct board_info __initdata boar +@@ -297,6 +315,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -90,7 +90,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -323,6 +343,8 @@ static struct board_info __initdata boar +@@ -321,6 +341,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -99,7 +99,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -348,6 +370,8 @@ static struct board_info __initdata boar +@@ -346,6 +368,8 @@ static struct board_info __initdata boar }, .enet1 = { @@ -108,7 +108,7 @@ .force_speed_100 = 1, .force_duplex_full = 1, }, -@@ -371,6 +395,8 @@ static struct board_info __initdata boar +@@ -369,6 +393,8 @@ static struct board_info __initdata boar }, .enet1 = { diff --git a/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch b/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch deleted file mode 100644 index dd63183a08..0000000000 --- a/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c -+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -46,7 +46,7 @@ static struct board_info __initdata boar - .ephy_reset_gpio = 36, - .ephy_reset_gpio_flags = GPIO_ACTIVE_LOW, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_3368 */ - - /* - * known 6328 boards -@@ -65,7 +65,7 @@ static struct board_info __initdata boar - .port_no = 0, - }, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6328 */ - - /* - * known 6338 boards -@@ -98,7 +98,7 @@ static struct board_info __initdata boar - .force_duplex_full = 1, - }, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6338 */ - - /* - * known 6345 boards -@@ -108,7 +108,7 @@ static struct board_info __initdata boar - .name = "96345GW2", - .expected_cpu_id = 0x6345, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6345 */ - - /* - * known 6348 boards -@@ -295,7 +295,7 @@ static struct board_info __initdata boar - - .has_ohci0 = 1, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6348 */ - - /* - * known 6358 boards -@@ -403,7 +403,7 @@ static struct board_info __initdata boar - - .has_ohci0 = 1, - }; --#endif -+#endif /* CONFIG_BCM63XX_CPU_6358 */ - - /* - * all boards diff --git a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch index 456b2a4466..cad12be975 100644 --- a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch +++ b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -295,6 +295,21 @@ static struct board_info __initdata boar +@@ -294,6 +294,21 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -22,15 +22,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -431,6 +446,7 @@ static const struct board_info __initcon +@@ -429,6 +444,7 @@ static const struct board_info __initcon &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, + &board_96348_D4PW, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -462,6 +478,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -459,6 +475,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch index 41c8a7e862..19bf51a160 100644 --- a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch +++ b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -418,6 +418,60 @@ static struct board_info __initdata boar +@@ -416,6 +416,60 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -61,16 +61,16 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -454,6 +508,8 @@ static const struct board_info __initcon +@@ -451,6 +505,8 @@ static const struct board_info __initcon &board_96358vw2, &board_AGPFS0, &board_DWVS0, + &board_nb4_ser_r0, + &board_nb4_fxc_r1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -495,6 +551,8 @@ static struct of_device_id const bcm963x +@@ -492,6 +548,8 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,a226m", .data = &board_DWVS0, }, { .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, }, { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, diff --git a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch index 69cc716e1a..8f81f7d4f9 100644 --- a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch +++ b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -487,6 +501,7 @@ static const struct board_info __initcon +@@ -485,6 +499,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, &board_96338w, + &board_96338w2_e7t, - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -524,6 +539,7 @@ static struct of_device_id const bcm963x +@@ -521,6 +536,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch index 9e3c4e0081..c85702fa84 100644 --- a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch +++ b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -385,6 +385,25 @@ static struct board_info __initdata boar +@@ -383,6 +383,25 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; @@ -26,7 +26,7 @@ static struct board_info __initdata board_AGPFS0 = { .name = "AGPF-S0", .expected_cpu_id = 0x6358, -@@ -522,6 +541,7 @@ static const struct board_info __initcon +@@ -519,6 +538,7 @@ static const struct board_info __initcon &board_96358vw, &board_96358vw2, &board_AGPFS0, @@ -34,7 +34,7 @@ &board_DWVS0, &board_nb4_ser_r0, &board_nb4_fxc_r1, -@@ -569,6 +589,7 @@ static struct of_device_id const bcm963x +@@ -566,6 +586,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch index e78832ecb2..f4df4443d5 100644 --- a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch +++ b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -452,6 +452,22 @@ static struct board_info __initdata boar +@@ -450,6 +450,22 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -23,15 +23,15 @@ static struct board_info __initdata board_nb4_ser_r0 = { .name = "NB4-SER-r0", .expected_cpu_id = 0x6358, -@@ -543,6 +559,7 @@ static const struct board_info __initcon +@@ -540,6 +556,7 @@ static const struct board_info __initcon &board_AGPFS0, &board_CPVA642, &board_DWVS0, + &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, - #endif -@@ -582,6 +599,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -579,6 +596,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch index f5ca73d7e2..837a6ff659 100644 --- a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch +++ b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -324,6 +324,36 @@ static struct board_info __initdata boar +@@ -323,6 +323,36 @@ static struct board_info __initdata boar .force_duplex_full = 1, }, }; @@ -37,15 +37,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -551,6 +581,7 @@ static const struct board_info __initcon +@@ -549,6 +579,7 @@ static const struct board_info __initcon &board_96348gw_a, &board_rta1025w_16, &board_96348_D4PW, + &board_spw500v, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -592,6 +623,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -589,6 +620,7 @@ static struct of_device_id const bcm963x { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, diff --git a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch index 77948d19fc..5bef9b4d27 100644 --- a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch +++ b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch @@ -49,7 +49,7 @@ static struct board_info __initdata board_FAST2404 = { .name = "F@ST2404", .expected_cpu_id = 0x6348, -@@ -574,6 +616,8 @@ static const struct board_info __initcon +@@ -572,6 +614,8 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, &board_96348gw, @@ -58,7 +58,7 @@ &board_96348gw_10, &board_96348gw_11, &board_FAST2404, -@@ -624,6 +668,8 @@ static struct of_device_id const bcm963x +@@ -621,6 +665,8 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, { .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, }, 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 3a88e01005..4d20a18fac 100644 --- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch +++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -396,6 +396,31 @@ static struct board_info __initdata boar +@@ -395,6 +395,31 @@ static struct board_info __initdata boar .num_board_fixups = ARRAY_SIZE(spw500v_fixups), }, }; @@ -32,15 +32,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -626,6 +651,7 @@ static const struct board_info __initcon +@@ -624,6 +649,7 @@ static const struct board_info __initcon &board_rta1025w_16, &board_96348_D4PW, &board_spw500v, + &board_96348sv, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -670,6 +696,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -667,6 +693,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, }, diff --git a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch index e6e94f71ff..4983bc2676 100644 --- a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch +++ b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -618,6 +618,32 @@ static struct board_info __initdata boar +@@ -616,6 +616,32 @@ static struct board_info __initdata boar .has_ehci0 = 1, .num_usbh_ports = 2, }; @@ -33,15 +33,15 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -663,6 +689,7 @@ static const struct board_info __initcon +@@ -660,6 +686,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, + &board_HW553, - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -706,6 +733,7 @@ static struct of_device_id const bcm963x +@@ -703,6 +730,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch index cfe55552f3..fdfe686ebe 100644 --- a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch +++ b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6338 */ /* -@@ -660,6 +674,7 @@ static const struct board_info __initcon +@@ -658,6 +672,7 @@ static const struct board_info __initcon &board_96338gw, &board_96338w, &board_96338w2_e7t, + &board_rta1320_16m, - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, -@@ -704,6 +719,7 @@ static struct of_device_id const bcm963x +@@ -701,6 +716,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6338 { .compatible = "brcm,bcm96338gw", .data = &board_96338gw, }, { .compatible = "brcm,bcm96338w", .data = &board_96338w, }, diff --git a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch index 69432c94dc..2ab72d47d1 100644 --- a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch +++ b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -658,6 +658,20 @@ static struct board_info __initdata boar +@@ -656,6 +656,20 @@ static struct board_info __initdata boar .pci_dev = 1, }, }; @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -705,6 +719,7 @@ static const struct board_info __initcon +@@ -702,6 +716,7 @@ static const struct board_info __initcon &board_nb4_ser_r0, &board_nb4_fxc_r1, &board_HW553, + &board_spw303v, - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; -@@ -756,6 +771,7 @@ static struct of_device_id const bcm963x +@@ -753,6 +768,7 @@ static struct of_device_id const bcm963x { .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, }, { .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, }, { .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, }, diff --git a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch index 47590af6e3..e7082ded75 100644 --- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch +++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -435,6 +435,26 @@ static struct board_info __initdata boar +@@ -434,6 +434,26 @@ static struct board_info __initdata boar .has_pccard = 1, .has_ehci0 = 1, }; @@ -27,15 +27,15 @@ #endif /* CONFIG_BCM63XX_CPU_6348 */ /* -@@ -707,6 +727,7 @@ static const struct board_info __initcon +@@ -705,6 +725,7 @@ static const struct board_info __initcon &board_96348_D4PW, &board_spw500v, &board_96348sv, + &board_V2500V_BB, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -746,6 +767,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -743,6 +764,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, @@ -43,7 +43,7 @@ { .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, }, { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, -@@ -805,6 +827,22 @@ void __init board_bcm963xx_init(void) +@@ -802,6 +824,22 @@ void __init board_bcm963xx_init(void) val &= MPI_CSBASE_BASE_MASK; } boot_addr = (u8 *)KSEG1ADDR(val); diff --git a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch index 4c14ea4413..0259432f96 100644 --- a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch +++ b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch @@ -25,15 +25,15 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -728,6 +746,7 @@ static const struct board_info __initcon +@@ -726,6 +744,7 @@ static const struct board_info __initcon &board_spw500v, &board_96348sv, &board_V2500V_BB, + &board_V2110, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -767,6 +786,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -764,6 +783,7 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, }, { .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, }, { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, diff --git a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch index acb533d0e8..4f8d33ff07 100644 --- a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch +++ b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch @@ -34,15 +34,15 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -747,6 +774,7 @@ static const struct board_info __initcon +@@ -745,6 +772,7 @@ static const struct board_info __initcon &board_96348sv, &board_V2500V_BB, &board_V2110, + &board_ct536_ct5621, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -788,6 +816,8 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -785,6 +813,8 @@ static struct of_device_id const bcm963x { .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, }, { .compatible = "bt,voyager-2110", .data = &board_V2110, }, { .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, }, diff --git a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch index 9ccb29bddd..35e93b1aa2 100644 --- a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch +++ b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -626,6 +626,7 @@ static struct board_info __initdata boar +@@ -624,6 +624,7 @@ static struct board_info __initdata boar }, .has_ohci0 = 1, 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 a6de00d36b..0843a99c41 100644 --- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch +++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch @@ -31,15 +31,15 @@ static struct board_info __initdata board_96348gw = { .name = "96348GW", .expected_cpu_id = 0x6348, -@@ -776,6 +800,7 @@ static const struct board_info __initcon +@@ -774,6 +798,7 @@ static const struct board_info __initcon &board_V2500V_BB, &board_V2110, &board_ct536_ct5621, + &board_96348A_122, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -818,6 +843,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -815,6 +840,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, }, 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 25e7f9ff0a..a210ebb690 100644 --- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch +++ b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch @@ -34,15 +34,15 @@ static struct board_info __initdata board_ct536_ct5621 = { .name = "CT536_CT5621", -@@ -801,6 +828,7 @@ static const struct board_info __initcon +@@ -799,6 +826,7 @@ static const struct board_info __initcon &board_V2110, &board_ct536_ct5621, &board_96348A_122, + &board_CPVA502plus, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -853,6 +881,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -850,6 +878,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, }, diff --git a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch index 17087b36a5..c33b493556 100644 --- a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch @@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -792,6 +792,58 @@ static struct board_info __initdata boar +@@ -790,6 +790,58 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -69,18 +69,17 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -843,6 +895,10 @@ static const struct board_info __initcon +@@ -840,6 +892,9 @@ static const struct board_info __initcon &board_HW553, &board_spw303v, - #endif -+ + #endif /* CONFIG_BCM63XX_CPU_6358 */ +#ifdef CONFIG_BCM63XX_CPU_6368 + &board_96368mvwg, -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6368 */ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -903,6 +959,7 @@ static struct of_device_id const bcm963x +@@ -900,6 +955,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch index 03bda96dff..5839209a4e 100644 --- a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch @@ -9,7 +9,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -841,6 +841,45 @@ static struct board_info __initdata boar +@@ -839,6 +839,45 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -55,15 +55,15 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -898,6 +937,7 @@ static const struct board_info __initcon - +@@ -894,6 +933,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, + &board_96368mvngr, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ }; -@@ -959,6 +999,7 @@ static struct of_device_id const bcm963x +@@ -955,6 +995,7 @@ static struct of_device_id const bcm963x { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif #ifdef CONFIG_BCM63XX_CPU_6368 diff --git a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 522d99976f..0518053070 100644 --- a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -50,15 +50,15 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -918,6 +952,7 @@ static const struct board_info __initcon - #endif +@@ -916,6 +950,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_963281TAN, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -974,6 +1009,7 @@ static struct of_device_id const bcm963x +@@ -970,6 +1005,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch index b91fff0695..ad3e689802 100644 --- a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch +++ b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch @@ -62,15 +62,15 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -953,6 +998,7 @@ static const struct board_info __initcon +@@ -951,6 +996,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, + &board_dsl_274xb_f1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1011,6 +1057,7 @@ static struct of_device_id const bcm963x +@@ -1007,6 +1053,7 @@ static struct of_device_id const bcm963x #ifdef CONFIG_BCM63XX_CPU_6328 { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch index 3a27db85c1..06bbd5d0fe 100644 --- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch +++ b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -568,6 +568,24 @@ static struct board_info __initdata boar +@@ -567,6 +567,24 @@ static struct board_info __initdata boar .has_ohci0 = 1, }; @@ -25,15 +25,15 @@ static struct board_info __initdata board_96348_D4PW = { .name = "D-4P-W", .expected_cpu_id = 0x6348, -@@ -1028,6 +1046,7 @@ static const struct board_info __initcon +@@ -1026,6 +1044,7 @@ static const struct board_info __initcon &board_ct536_ct5621, &board_96348A_122, &board_CPVA502plus, + &board_96348W3, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1083,6 +1102,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -1079,6 +1098,7 @@ static struct of_device_id const bcm963x { .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, }, { .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, }, { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, diff --git a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch index 0cfcc173fe..4a8be4c4d6 100644 --- a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch +++ b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -874,6 +874,30 @@ static struct board_info __initdata boar +@@ -872,6 +872,30 @@ static struct board_info __initdata boar .num_usbh_ports = 2, }; @@ -31,15 +31,15 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1058,6 +1082,7 @@ static const struct board_info __initcon +@@ -1055,6 +1079,7 @@ static const struct board_info __initcon &board_dsl_274xb_rev_c, &board_nb4_ser_r0, &board_nb4_fxc_r1, + &board_ct6373_1, &board_HW553, &board_spw303v, - #endif -@@ -1116,6 +1141,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -1112,6 +1137,7 @@ static struct of_device_id const bcm963x { .compatible = "alcatel,rg100a", .data = &board_96358vw2, }, { .compatible = "brcm,bcm96358vw", .data = &board_96358vw, }, { .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch index 45e8717be0..5c356cfe04 100644 --- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch +++ b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -937,6 +937,33 @@ static struct board_info __initdata boar +@@ -935,6 +935,33 @@ static struct board_info __initdata boar .use_internal_phy = 1, }, }; @@ -34,15 +34,15 @@ #endif /* CONFIG_BCM63XX_CPU_6358 */ /* -@@ -1085,6 +1112,7 @@ static const struct board_info __initcon +@@ -1082,6 +1109,7 @@ static const struct board_info __initcon &board_ct6373_1, &board_HW553, &board_spw303v, + &board_DVAG3810BN, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1144,6 +1172,7 @@ static struct of_device_id const bcm963x + &board_96368mvwg, +@@ -1140,6 +1168,7 @@ static struct of_device_id const bcm963x { .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, }, { .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, }, { .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, }, diff --git a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch index b4de7cb078..888bc7fc5a 100644 --- a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch +++ b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch @@ -1,6 +1,6 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -966,6 +966,32 @@ static struct board_info __initdata boar +@@ -964,6 +964,32 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -33,18 +33,17 @@ /* * known 6368 boards */ -@@ -1115,6 +1141,10 @@ static const struct board_info __initcon +@@ -1111,6 +1137,9 @@ static const struct board_info __initcon + &board_spw303v, &board_DVAG3810BN, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6358 */ +#ifdef CONFIG_BCM63XX_CPU_6362 + &board_nb6, -+#endif -+ ++#endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x +@@ -1179,6 +1208,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif diff --git a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch index 9e42c40b57..bebdd8be14 100644 --- a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch +++ b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch @@ -23,7 +23,7 @@ static struct board_info __initdata board_rta1025w_16 = { .name = "RTA1025W_16", .expected_cpu_id = 0x6348, -@@ -1112,6 +1128,7 @@ static const struct board_info __initcon +@@ -1110,6 +1126,7 @@ static const struct board_info __initcon &board_96348gw_10, &board_96348gw_11, &board_FAST2404, @@ -31,7 +31,7 @@ &board_DV201AMR, &board_96348gw_a, &board_rta1025w_16, -@@ -1187,6 +1204,7 @@ static struct of_device_id const bcm963x +@@ -1182,6 +1199,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, }, { .compatible = "netgear,dg834g-v4", .data = &board_96348W3, }, { .compatible = "sagem,fast-2404", .data = &board_FAST2404, }, diff --git a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch index 0cecd9cb6c..dd13df4920 100644 --- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch +++ b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch @@ -50,15 +50,15 @@ static struct board_info __initdata board_dsl_274xb_f1 = { .name = "AW4339U", .expected_cpu_id = 0x6328, -@@ -1109,6 +1152,7 @@ static const struct board_info __initcon +@@ -1107,6 +1150,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_963281TAN, + &board_A4001N1, &board_dsl_274xb_f1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 -@@ -1174,6 +1218,7 @@ static struct of_device_id const bcm963x +@@ -1169,6 +1213,7 @@ static struct of_device_id const bcm963x { .compatible = "netgear,cvg834g", .data = &board_cvg834g, }, #endif #ifdef CONFIG_BCM63XX_CPU_6328 diff --git a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch index f2af2c5b2c..d3088c5847 100644 --- a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch +++ b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch @@ -79,15 +79,15 @@ static struct board_info __initdata board_963281TAN = { .name = "963281TAN", .expected_cpu_id = 0x6328, -@@ -1151,6 +1223,7 @@ static const struct board_info __initcon - #endif +@@ -1149,6 +1221,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AR5387un, &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, -@@ -1221,6 +1294,7 @@ static struct of_device_id const bcm963x +@@ -1216,6 +1289,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch index dc8efed328..1842471033 100644 --- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch +++ b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch @@ -61,15 +61,15 @@ static struct sprom_fixup __initdata ar5387un_fixups[] = { { .offset = 2, .value = 0x05bb }, { .offset = 65, .value = 0x1204 }, -@@ -1223,6 +1277,7 @@ static const struct board_info __initcon - #endif +@@ -1221,6 +1275,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AR5381u, &board_AR5387un, &board_963281TAN, &board_A4001N1, -@@ -1294,6 +1349,7 @@ static struct of_device_id const bcm963x +@@ -1289,6 +1344,7 @@ static struct of_device_id const bcm963x { .compatible = "adb,a4001n1", .data = &board_A4001N1, }, { .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, }, { .compatible = "brcm,bcm96328avng", .data = &board_96328avng, }, diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch index d56df55622..31e2192e0d 100644 --- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch +++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch @@ -21,15 +21,15 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1291,6 +1305,7 @@ static const struct board_info __initcon - #endif +@@ -1289,6 +1303,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6338 */ #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, + &board_rta770bw, - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1361,6 +1376,7 @@ static struct of_device_id const bcm963x +@@ -1356,6 +1371,7 @@ static struct of_device_id const bcm963x #endif #ifdef CONFIG_BCM63XX_CPU_6345 { .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, }, 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 cf55255cd1..f9ca476ed4 100644 --- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch +++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch @@ -8,7 +8,7 @@ #include #include #include -@@ -1123,6 +1124,92 @@ static struct board_info __initdata boar +@@ -1121,6 +1122,92 @@ static struct board_info __initdata boar }, }; @@ -101,7 +101,7 @@ /* T-Home Speedport W 303V Typ B */ static struct board_info __initdata board_spw303v = { .name = "96358-502V", -@@ -1341,6 +1428,9 @@ static const struct board_info __initcon +@@ -1338,6 +1425,9 @@ static const struct board_info __initcon &board_nb4_fxc_r1, &board_ct6373_1, &board_HW553, @@ -110,8 +110,8 @@ + &board_HW556_C, &board_spw303v, &board_DVAG3810BN, - #endif -@@ -1413,6 +1503,9 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6358 */ +@@ -1408,6 +1498,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 index c78e59efd3..b6092ed068 100644 --- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch +++ b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch @@ -26,15 +26,15 @@ #endif /* CONFIG_BCM63XX_CPU_6345 */ /* -@@ -1393,6 +1412,7 @@ static const struct board_info __initcon +@@ -1391,6 +1410,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6345 &board_96345gw2, &board_rta770bw, + &board_rta770w, - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ #ifdef CONFIG_BCM63XX_CPU_6348 &board_96348r, -@@ -1467,6 +1487,7 @@ static struct of_device_id const bcm963x +@@ -1462,6 +1482,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, }, 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 358e97480d..23b90002ff 100644 --- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch +++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch @@ -56,15 +56,15 @@ Signed-off-by: Marcin Jurkowski #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -1402,6 +1439,7 @@ static const struct board_info __initcon +@@ -1400,6 +1437,7 @@ static const struct board_info __initcon &board_963281TAN, &board_A4001N1, &board_dsl_274xb_f1, + &board_FAST2704V2, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -1477,6 +1515,7 @@ static struct of_device_id const bcm963x +@@ -1472,6 +1510,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 ff0440772b..7ad967e3a7 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 -@@ -1332,6 +1332,41 @@ static struct board_info __initdata boar +@@ -1330,6 +1330,41 @@ static struct board_info __initdata boar }, }, }; @@ -48,15 +48,15 @@ Signed-off-by: Max Staudt #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -1495,6 +1530,7 @@ static const struct board_info __initcon - +@@ -1491,6 +1526,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, + &board_fast2504n, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -1576,6 +1612,7 @@ static struct of_device_id const bcm963x + &board_96368mvwg, +@@ -1571,6 +1607,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 c9c532d30e..403599c1de 100644 --- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch +++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch @@ -56,17 +56,17 @@ * known 6328 boards */ #ifdef CONFIG_BCM63XX_CPU_6328 -@@ -1467,6 +1516,9 @@ static const struct board_info __initcon +@@ -1465,6 +1514,9 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_3368 &board_cvg834g, - #endif + #endif /* CONFIG_BCM63XX_CPU_3368 */ +#ifdef CONFIG_BCM63XX_CPU_6318 + &board_96318ref, -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, &board_AR5381u, -@@ -1544,6 +1596,9 @@ static struct of_device_id const bcm963x +@@ -1539,6 +1591,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 f4ff4fd691..2e85271470 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 @@ -51,15 +51,15 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1518,6 +1562,7 @@ static const struct board_info __initcon - #endif +@@ -1516,6 +1560,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_3368 */ #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, + &board_96318ref_p300, - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -1598,6 +1643,7 @@ static struct of_device_id const bcm963x +@@ -1593,6 +1638,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 d5af2f0d1c..de4bff8b9d 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 -@@ -1554,6 +1554,50 @@ static struct board_info __initdata boar +@@ -1552,6 +1552,50 @@ static struct board_info __initdata boar #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -51,17 +51,17 @@ * all boards */ static const struct board_info __initconst *bcm963xx_boards[] = { -@@ -1634,6 +1678,9 @@ static const struct board_info __initcon +@@ -1629,6 +1673,9 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ +#ifdef CONFIG_BCM63XX_CPU_63268 + &board_963269bhr, -+#endif ++#endif /* CONFIG_BCM63XX_CPU_63268 */ }; static struct of_device_id const bcm963xx_boards_dt[] = { -@@ -1721,6 +1768,7 @@ static struct of_device_id const bcm963x +@@ -1716,6 +1763,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 85521b44be..2580c8eb72 100644 --- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch +++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch @@ -30,15 +30,15 @@ Signed-off-by: Adrian Feliks /* BT Voyager 2110 */ static struct board_info __initdata board_V2110 = { -@@ -1649,6 +1664,7 @@ static const struct board_info __initcon +@@ -1647,6 +1662,7 @@ static const struct board_info __initcon &board_96348A_122, &board_CPVA502plus, &board_96348W3, + &board_96348gw_10_AR1004G, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6348 */ #ifdef CONFIG_BCM63XX_CPU_6358 -@@ -1713,6 +1729,7 @@ static struct of_device_id const bcm963x + &board_96358vw, +@@ -1708,6 +1724,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 da9000ac3e..d3e1ec6de4 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 -@@ -1610,6 +1610,53 @@ static struct board_info __initdata boar +@@ -1608,6 +1608,53 @@ static struct board_info __initdata boar }, }, }; @@ -54,15 +54,15 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -1696,6 +1743,7 @@ static const struct board_info __initcon - #endif +@@ -1691,6 +1738,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963269bhr, + &board_vw6339gu, - #endif + #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -1786,6 +1834,7 @@ static struct of_device_id const bcm963x +@@ -1781,6 +1829,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 2cd09b69e2..5a422b54de 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 -@@ -1572,6 +1572,72 @@ static struct board_info __initdata boar +@@ -1570,6 +1570,72 @@ static struct board_info __initdata boar * known 63268/63269 boards */ #ifdef CONFIG_BCM63XX_CPU_63268 @@ -73,15 +73,15 @@ static struct board_info __initdata board_963269bhr = { .name = "963269BHR", .expected_cpu_id = 0x63268, -@@ -1742,6 +1808,7 @@ static const struct board_info __initcon +@@ -1737,6 +1803,7 @@ static const struct board_info __initcon &board_96368mvngr, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 + &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, - #endif -@@ -1833,6 +1900,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_63268 */ +@@ -1828,6 +1895,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 c08c2c0fc0..5466c0c4f4 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 -@@ -1566,6 +1568,47 @@ static struct board_info __initdata boar +@@ -1564,6 +1566,47 @@ static struct board_info __initdata boar .has_ohci0 = 1, .has_ehci0 = 1, }; @@ -57,15 +57,15 @@ #endif /* CONFIG_BCM63XX_CPU_6368 */ /* -@@ -1806,6 +1849,7 @@ static const struct board_info __initcon +@@ -1801,6 +1844,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, + &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, -@@ -1898,6 +1942,7 @@ static struct of_device_id const bcm963x +@@ -1893,6 +1937,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 b92f032047..31cfb76898 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 -@@ -1569,6 +1569,59 @@ static struct board_info __initdata boar +@@ -1567,6 +1567,59 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -60,15 +60,15 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1849,6 +1902,7 @@ static const struct board_info __initcon +@@ -1844,6 +1897,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, + &board_VR3025u, &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1942,6 +1996,7 @@ static struct of_device_id const bcm963x +@@ -1937,6 +1991,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 ec0e13db56..207f6810fe 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 -@@ -1622,6 +1622,59 @@ static struct board_info __initdata boar +@@ -1620,6 +1620,59 @@ static struct board_info __initdata boar }, }; @@ -60,15 +60,15 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -1903,6 +1956,7 @@ static const struct board_info __initcon +@@ -1898,6 +1951,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_VR3025u, + &board_VR3025un, &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -1997,6 +2051,7 @@ static struct of_device_id const bcm963x +@@ -1992,6 +2046,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 6b60a3fa86..2941a954cf 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 -@@ -1578,6 +1578,48 @@ static struct sprom_fixup __initdata vr3 +@@ -1576,6 +1576,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, -@@ -1955,6 +1997,7 @@ static const struct board_info __initcon +@@ -1950,6 +1992,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, -@@ -2053,6 +2096,7 @@ static struct of_device_id const bcm963x +@@ -2048,6 +2091,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 aaf662a76c..e7751c353e 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 -@@ -1264,6 +1264,36 @@ static struct board_info __initdata boar +@@ -1262,6 +1262,36 @@ static struct board_info __initdata boar }, }; @@ -37,7 +37,7 @@ static struct board_info __initdata board_HW553 = { .name = "HW553", .expected_cpu_id = 0x6358, -@@ -1981,6 +2011,7 @@ static const struct board_info __initcon +@@ -1978,6 +2008,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, -@@ -2073,6 +2104,7 @@ static struct of_device_id const bcm963x +@@ -2068,6 +2099,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 1992e0c6d4..930cbdfd98 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, -@@ -1962,6 +2005,7 @@ static const struct board_info __initcon +@@ -1960,6 +2003,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, -@@ -2050,6 +2094,7 @@ static struct of_device_id const bcm963x +@@ -2045,6 +2089,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 7eb52ae863..18421a9108 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 @@ -75,15 +75,15 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -1999,6 +2067,7 @@ static const struct board_info __initcon +@@ -1997,6 +2065,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, + &board_dsl_2751b_d1, - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2092,6 +2161,7 @@ static struct of_device_id const bcm963x +@@ -2087,6 +2156,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 936aab115b..ffb1e2d863 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 -@@ -1710,6 +1710,30 @@ static struct board_info __initdata boar +@@ -1708,6 +1708,30 @@ static struct board_info __initdata boar .has_ehci0 = 1, }; @@ -31,7 +31,7 @@ static struct sprom_fixup __initdata vr3025u_fixups[] = { { .offset = 97, .value = 0xfeb3 }, { .offset = 98, .value = 0x1618 }, -@@ -2141,6 +2165,7 @@ static const struct board_info __initcon +@@ -2136,6 +2160,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, -@@ -2243,6 +2268,7 @@ static struct of_device_id const bcm963x +@@ -2238,6 +2263,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 267143cf94..0da3634a21 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 -@@ -1375,6 +1375,31 @@ static struct board_info __initdata boar +@@ -1373,6 +1373,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, -@@ -2148,6 +2173,7 @@ static const struct board_info __initcon +@@ -2145,6 +2170,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, -@@ -2257,6 +2283,7 @@ static struct of_device_id const bcm963x +@@ -2252,6 +2278,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 d1b865134a..f89c19233e 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 -@@ -1759,6 +1759,52 @@ static struct board_info __initdata boar +@@ -1757,6 +1757,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 }, -@@ -2192,6 +2238,7 @@ static const struct board_info __initcon +@@ -2187,6 +2233,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, -@@ -2295,6 +2342,7 @@ static struct of_device_id const bcm963x +@@ -2290,6 +2337,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 59f57bc8dc..4a74960e5d 100644 --- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch +++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch @@ -46,15 +46,15 @@ #endif /* CONFIG_BCM63XX_CPU_6318 */ /* -@@ -2163,6 +2202,7 @@ static const struct board_info __initcon +@@ -2161,6 +2200,7 @@ static const struct board_info __initcon &board_96318ref, &board_96318ref_p300, &board_dsl_2751b_d1, + &board_FAST2704N, - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, -@@ -2260,6 +2300,7 @@ static struct of_device_id const bcm963x +@@ -2255,6 +2295,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 1455b748ce..607e49d957 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 -@@ -1992,6 +1992,59 @@ static struct board_info __initdata boar +@@ -1990,6 +1990,59 @@ static struct board_info __initdata boar }, }; @@ -60,15 +60,15 @@ static struct sprom_fixup __initdata wap5813n_fixups[] = { { .offset = 97, .value = 0xfeed }, { .offset = 98, .value = 0x15d1 }, -@@ -2282,6 +2335,7 @@ static const struct board_info __initcon +@@ -2277,6 +2330,7 @@ static const struct board_info __initcon &board_P870HW51A_V2, &board_VR3025u, &board_VR3025un, + &board_VR3026e, &board_WAP5813n, - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ #ifdef CONFIG_BCM63XX_CPU_63268 -@@ -2382,6 +2436,7 @@ static struct of_device_id const bcm963x +@@ -2377,6 +2431,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 8c9cc3944f..24b12f7ad7 100644 --- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch +++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch @@ -51,15 +51,15 @@ #endif /* CONFIG_BCM63XX_CPU_6328 */ /* -@@ -2266,6 +2310,7 @@ static const struct board_info __initcon +@@ -2264,6 +2308,7 @@ static const struct board_info __initcon &board_A4001N1, &board_dsl_274xb_f1, &board_FAST2704V2, + &board_R5010UNV2, - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ #ifdef CONFIG_BCM63XX_CPU_6338 &board_96338gw, -@@ -2364,6 +2409,7 @@ static struct of_device_id const bcm963x +@@ -2359,6 +2404,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 31c83972cc..9ff6a10397 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 -@@ -1888,6 +1888,52 @@ static struct board_info __initdata boar +@@ -1886,6 +1886,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 }, -@@ -2376,6 +2422,7 @@ static const struct board_info __initcon +@@ -2371,6 +2417,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, -@@ -2484,6 +2531,7 @@ static struct of_device_id const bcm963x +@@ -2479,6 +2526,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 6981b2ae16..1eac718426 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 -@@ -1842,6 +1842,42 @@ static struct board_info __initdata boar +@@ -1840,6 +1840,42 @@ static struct board_info __initdata boar }, }; @@ -43,7 +43,7 @@ static struct board_info __initdata board_HG655b = { .name = "HW65x", .expected_cpu_id = 0x6368, -@@ -2422,6 +2458,7 @@ static const struct board_info __initcon +@@ -2417,6 +2453,7 @@ static const struct board_info __initcon &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, @@ -51,7 +51,7 @@ &board_HG622, &board_HG655b, &board_P870HW51A_V2, -@@ -2534,6 +2571,7 @@ static struct of_device_id const bcm963x +@@ -2529,6 +2566,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 fbf58fe33a..2722b9ef4e 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 -@@ -1732,6 +1732,51 @@ static struct board_info __initdata boar +@@ -1730,6 +1730,51 @@ static struct board_info __initdata boar * known 6368 boards */ #ifdef CONFIG_BCM63XX_CPU_6368 @@ -52,15 +52,15 @@ static struct board_info __initdata board_96368mvwg = { .name = "96368MVWG", .expected_cpu_id = 0x6368, -@@ -2455,6 +2500,7 @@ static const struct board_info __initcon - #endif - +@@ -2450,6 +2495,7 @@ static const struct board_info __initcon + &board_fast2504n, + #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 + &board_AV4202N, &board_96368mvwg, &board_96368mvngr, &board_DGND3700v1_3800B, -@@ -2562,6 +2608,7 @@ static struct of_device_id const bcm963x +@@ -2557,6 +2603,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 b89ac7fd49..8beea94da0 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 -@@ -2216,6 +2216,106 @@ static struct board_info __initdata boar +@@ -2214,6 +2214,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 }, -@@ -2508,6 +2608,7 @@ static const struct board_info __initcon +@@ -2503,6 +2603,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -115,7 +115,7 @@ &board_VR3025u, &board_VR3025un, &board_VR3026e, -@@ -2619,6 +2720,7 @@ static struct of_device_id const bcm963x +@@ -2614,6 +2715,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 9c42c6ea84..ec7e4bacdc 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 -@@ -2066,6 +2066,29 @@ static struct board_info __initdata boar +@@ -2064,6 +2064,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, -@@ -2608,6 +2631,7 @@ static const struct board_info __initcon +@@ -2603,6 +2626,7 @@ static const struct board_info __initcon &board_HG622, &board_HG655b, &board_P870HW51A_V2, @@ -38,7 +38,7 @@ &board_VH4032N, &board_VR3025u, &board_VR3025un, -@@ -2709,6 +2733,7 @@ static struct of_device_id const bcm963x +@@ -2704,6 +2728,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 e7fe6f69ac..388b71aa9b 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 @@ -68,15 +68,15 @@ static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = { { .offset = 96, .value = 0x2046 }, { .offset = 97, .value = 0xfe9d }, -@@ -2548,6 +2609,7 @@ static const struct board_info __initcon +@@ -2546,6 +2607,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_6318 &board_96318ref, &board_96318ref_p300, + &board_AR5315u, &board_dsl_2751b_d1, &board_FAST2704N, - #endif -@@ -2653,6 +2715,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6318 */ +@@ -2648,6 +2710,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 b50954a156..a59571a096 100644 --- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch +++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch @@ -74,15 +74,15 @@ static struct sprom_fixup __initdata ar5381u_fixups[] = { { .offset = 97, .value = 0xfee5 }, { .offset = 98, .value = 0x157c }, -@@ -2615,6 +2682,7 @@ static const struct board_info __initcon - #endif +@@ -2613,6 +2680,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6318 */ #ifdef CONFIG_BCM63XX_CPU_6328 &board_96328avng, + &board_AD1018, &board_AR5381u, &board_AR5387un, &board_963281TAN, -@@ -2729,6 +2797,8 @@ static struct of_device_id const bcm963x +@@ -2724,6 +2792,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 8bae6c378b..8ab891f370 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 -@@ -2664,6 +2664,49 @@ static struct board_info __initdata boar +@@ -2662,6 +2662,49 @@ static struct board_info __initdata boar }, }, }; @@ -50,15 +50,15 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2772,6 +2815,7 @@ static const struct board_info __initcon +@@ -2767,6 +2810,7 @@ static const struct board_info __initcon &board_963268bu_p300, &board_963269bhr, &board_vw6339gu, + &board_BSKYB_63168, - #endif + #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -2885,6 +2929,7 @@ static struct of_device_id const bcm963x +@@ -2880,6 +2924,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 925b150415..4c7ed72862 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 -@@ -2618,6 +2618,44 @@ static struct board_info __initdata boar +@@ -2616,6 +2616,44 @@ static struct board_info __initdata boar }, }; @@ -45,15 +45,15 @@ static struct board_info __initdata board_vw6339gu = { .name = "VW6339GU", .expected_cpu_id = 0x63268, -@@ -2814,6 +2852,7 @@ static const struct board_info __initcon +@@ -2809,6 +2847,7 @@ static const struct board_info __initcon #ifdef CONFIG_BCM63XX_CPU_63268 &board_963268bu_p300, &board_963269bhr, + &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, - #endif -@@ -2928,6 +2967,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_63268 */ +@@ -2923,6 +2962,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 2a39c733eb..e8f3044385 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 -@@ -1820,6 +1820,31 @@ static struct board_info __initdata boar +@@ -1818,6 +1818,31 @@ static struct board_info __initdata boar }, }; @@ -32,15 +32,15 @@ static struct board_info __initdata board_fast2504n = { .name = "F@ST2504n", .expected_cpu_id = 0x6362, -@@ -2830,6 +2855,7 @@ static const struct board_info __initcon - +@@ -2826,6 +2851,7 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ #ifdef CONFIG_BCM63XX_CPU_6362 &board_nb6, + &board_dgnd3700v2, &board_fast2504n, - #endif - -@@ -2945,6 +2971,7 @@ static struct of_device_id const bcm963x + #endif /* CONFIG_BCM63XX_CPU_6362 */ + #ifdef CONFIG_BCM63XX_CPU_6368 +@@ -2940,6 +2966,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 7d39125cee..af4baf4710 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 -@@ -2643,6 +2643,31 @@ static struct board_info __initdata boar +@@ -2641,6 +2641,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, -@@ -2878,6 +2903,7 @@ static const struct board_info __initcon +@@ -2873,6 +2898,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, -@@ -2994,6 +3020,7 @@ static struct of_device_id const bcm963x +@@ -2989,6 +3015,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 cbcd2ade96..cce5720322 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 -@@ -1879,6 +1879,37 @@ static struct board_info __initdata boar +@@ -1877,6 +1877,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,15 +38,15 @@ #endif /* CONFIG_BCM63XX_CPU_6362 */ /* -@@ -2882,6 +2913,7 @@ static const struct board_info __initcon +@@ -2878,6 +2909,7 @@ static const struct board_info __initcon &board_nb6, &board_dgnd3700v2, &board_fast2504n, + &board_hg253s_v2, - #endif - + #endif /* CONFIG_BCM63XX_CPU_6362 */ #ifdef CONFIG_BCM63XX_CPU_6368 -@@ -2997,6 +3029,7 @@ static struct of_device_id const bcm963x + &board_AV4202N, +@@ -2992,6 +3024,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 3976527b37..c07b65b768 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, -@@ -2849,6 +2892,7 @@ static const struct board_info __initcon +@@ -2847,6 +2890,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, -@@ -2957,6 +3001,7 @@ static struct of_device_id const bcm963x +@@ -2952,6 +2996,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 eaa28a9778..8b48155d25 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 -@@ -2869,6 +2869,37 @@ static struct board_info __initdata boar +@@ -2867,6 +2867,37 @@ static struct board_info __initdata boar }, }, }; @@ -38,15 +38,15 @@ #endif /* CONFIG_BCM63XX_CPU_63268 */ /* -@@ -2983,6 +3014,7 @@ static const struct board_info __initcon +@@ -2978,6 +3009,7 @@ static const struct board_info __initcon &board_VR3032u, &board_vw6339gu, &board_BSKYB_63168, + &board_H500s, - #endif + #endif /* CONFIG_BCM63XX_CPU_63268 */ }; -@@ -3101,6 +3133,8 @@ static struct of_device_id const bcm963x +@@ -3096,6 +3128,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