Browse Source

bcm63xx: switch to upstream endif comments patch

This allows better context for board patches and we no longer need a
downstream patch for that.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
master
Álvaro Fernández Rojas 2 years ago
parent
commit
f41a40001a
  1. 155
      target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch
  2. 2
      target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch
  3. 2
      target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch
  4. 14
      target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
  5. 2
      target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch
  6. 2
      target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch
  7. 2
      target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
  8. 2
      target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
  9. 2
      target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
  10. 2
      target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch
  11. 2
      target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch
  12. 10
      target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch
  13. 8
      target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch
  14. 2
      target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch
  15. 2
      target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch
  16. 12
      target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch
  17. 8
      target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch
  18. 12
      target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch
  19. 56
      target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch
  20. 10
      target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch
  21. 8
      target/linux/bcm63xx/patches-5.4/501-board-NB4.patch
  22. 6
      target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch
  23. 6
      target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch
  24. 8
      target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch
  25. 10
      target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch
  26. 4
      target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch
  27. 10
      target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
  28. 8
      target/linux/bcm63xx/patches-5.4/508-board_hw553.patch
  29. 6
      target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch
  30. 8
      target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch
  31. 12
      target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
  32. 8
      target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch
  33. 8
      target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch
  34. 2
      target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch
  35. 8
      target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
  36. 8
      target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
  37. 11
      target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch
  38. 10
      target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch
  39. 8
      target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch
  40. 6
      target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch
  41. 10
      target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
  42. 8
      target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch
  43. 10
      target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
  44. 13
      target/linux/bcm63xx/patches-5.4/526-board_nb6.patch
  45. 4
      target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch
  46. 6
      target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
  47. 6
      target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch
  48. 6
      target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
  49. 8
      target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch
  50. 8
      target/linux/bcm63xx/patches-5.4/532-board_hw556.patch
  51. 6
      target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
  52. 6
      target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch
  53. 12
      target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch
  54. 8
      target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch
  55. 8
      target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch
  56. 10
      target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch
  57. 8
      target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch
  58. 10
      target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
  59. 10
      target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
  60. 8
      target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
  61. 8
      target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch
  62. 8
      target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
  63. 6
      target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
  64. 6
      target/linux/bcm63xx/patches-5.4/546-board_hw520.patch
  65. 4
      target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
  66. 6
      target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch
  67. 6
      target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch
  68. 6
      target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch
  69. 6
      target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch
  70. 6
      target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
  71. 8
      target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
  72. 6
      target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
  73. 6
      target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
  74. 6
      target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch
  75. 10
      target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
  76. 6
      target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
  77. 6
      target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
  78. 6
      target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch
  79. 6
      target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
  80. 8
      target/linux/bcm63xx/patches-5.4/562-board_sr102.patch
  81. 8
      target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
  82. 12
      target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
  83. 6
      target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch
  84. 10
      target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch
  85. 4
      target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch
  86. 8
      target/linux/bcm63xx/patches-5.4/568-board-H500s.patch

155
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?= <noltari@gmail.com>
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 <noltari@gmail.com>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
---
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();

2
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 <florian@openwrt.org>
#include <bcm63xx_dev_usb_usbd.h>
#include <board_bcm963xx.h>
@@ -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);

2
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 <florian@openwrt.org>
#include <bcm63xx_dev_usb_ohci.h>
#include <bcm63xx_dev_usb_usbd.h>
#include <board_bcm963xx.h>
@@ -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);

14
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 <jogo@openwrt.org>
/*
* 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 <jogo@openwrt.org>
- return -EINVAL;
- }
-}
-#endif
-#endif /* CONFIG_SSB_PCIHOST */
-
-/*
- * return board name for /proc/cpuinfo
@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
* 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 <jogo@openwrt.org>
- 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 <jogo@openwrt.org>
- 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();
-

2
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 <jogo@openwrt.org>
--- 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 */

2
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;

2
target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch

@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
--- 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

2
target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch

@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
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
*/

2
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
*/

2
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,

2
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 <jogo@openwrt.org>
+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
*/

10
target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch

@ -74,7 +74,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.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 <jogo@openwrt.org>
.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 <jogo@openwrt.org>
.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 <jogo@openwrt.org>
.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 <jogo@openwrt.org>
.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,

8
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 <jogo@openwrt.org>
--- 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 <jogo@openwrt.org>
/*
* 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 <jogo@openwrt.org>
/* 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();
}

2
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 <jogo@openwrt.org>
--- 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[] = {

2
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 <jogo@openwrt.org>
- .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

12
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,

8
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,

12
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 = {

56
target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch

@ -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

10
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, },

8
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, },

6
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, },

6
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, },

8
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, },

10
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, },

4
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, },

10
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, },

8
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, },

6
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, },

8
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, },

12
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);

8
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, },

8
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, },

2
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,

8
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, },

8
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, },

11
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

10
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

8
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

6
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, },

10
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, },

8
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, },

10
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, },

13
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

4
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, },

6
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

6
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, },

6
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, },

8
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, },

8
target/linux/bcm63xx/patches-5.4/532-board_hw556.patch

@ -8,7 +8,7 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -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, },

6
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, },

6
target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch

@ -56,15 +56,15 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
#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