mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-04 04:54:18 +00:00
4eba86820f
Refreshed all patches. Fixes: - CVE-2019-14896 - CVE-2019-14897 Remove upstreamed: - 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch Altered patches: - 102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch - 105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch - 106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch - 108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch - 207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch - 350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch - 356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch - 390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch - 391-MIPS-BCM63XX-do-not-register-uart.patch - 392-MIPS-BCM63XX-remove-leds-and-buttons.patch - 416-BCM63XX-add-a-fixup-for-ath9k-devices.patch - 422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch - Compile-tested on: brcm63xx, cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
119 lines
2.7 KiB
Diff
119 lines
2.7 KiB
Diff
From eeacc2529942051504bc957726aa178671344421 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Bizon <mbizon@freebox.fr>
|
|
Date: Wed, 20 Jan 2010 16:21:30 +0100
|
|
Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
|
|
|
|
---
|
|
arch/mips/bcm63xx/boards/board_bcm963xx.c | 95 ++++++++++++++++++++
|
|
.../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 2 +
|
|
2 files changed, 97 insertions(+), 0 deletions(-)
|
|
|
|
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
@@ -826,6 +826,58 @@ static struct board_info __initdata boar
|
|
#endif /* CONFIG_BCM63XX_CPU_6358 */
|
|
|
|
/*
|
|
+ * known 6368 boards
|
|
+ */
|
|
+#ifdef CONFIG_BCM63XX_CPU_6368
|
|
+static struct board_info __initdata board_96368mvwg = {
|
|
+ .name = "96368MVWG",
|
|
+ .expected_cpu_id = 0x6368,
|
|
+
|
|
+ .has_pci = 1,
|
|
+
|
|
+ .has_usbd = 1,
|
|
+
|
|
+ .usbd = {
|
|
+ .use_fullspeed = 0,
|
|
+ .port_no = 0,
|
|
+ },
|
|
+
|
|
+ .has_enetsw = 1,
|
|
+
|
|
+ .enetsw = {
|
|
+ .used_ports = {
|
|
+ [1] = {
|
|
+ .used = 1,
|
|
+ .phy_id = 2,
|
|
+ .name = "port1",
|
|
+ },
|
|
+
|
|
+ [2] = {
|
|
+ .used = 1,
|
|
+ .phy_id = 3,
|
|
+ .name = "port2",
|
|
+ },
|
|
+
|
|
+ [4] = {
|
|
+ .used = 1,
|
|
+ .phy_id = 0x12,
|
|
+ .name = "port0",
|
|
+ },
|
|
+
|
|
+ [5] = {
|
|
+ .used = 1,
|
|
+ .phy_id = 0x11,
|
|
+ .name = "port3",
|
|
+ },
|
|
+ },
|
|
+ },
|
|
+
|
|
+ .has_ohci0 = 1,
|
|
+ .has_ehci0 = 1,
|
|
+};
|
|
+#endif /* CONFIG_BCM63XX_CPU_6368 */
|
|
+
|
|
+/*
|
|
* all boards
|
|
*/
|
|
static const struct board_info __initconst *bcm963xx_boards[] = {
|
|
@@ -877,6 +929,10 @@ static const struct board_info __initcon
|
|
&board_HW553,
|
|
&board_spw303v,
|
|
#endif
|
|
+
|
|
+#ifdef CONFIG_BCM63XX_CPU_6368
|
|
+ &board_96368mvwg,
|
|
+#endif
|
|
};
|
|
|
|
static struct of_device_id const bcm963xx_boards_dt[] = {
|
|
@@ -937,6 +993,7 @@ static struct of_device_id const bcm963x
|
|
{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
|
|
#endif
|
|
#ifdef CONFIG_BCM63XX_CPU_6368
|
|
+ { .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
|
|
#endif
|
|
#ifdef CONFIG_BCM63XX_CPU_63268
|
|
#endif
|
|
--- a/arch/mips/bcm63xx/boards/board_common.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_common.c
|
|
@@ -82,12 +82,25 @@ void __init board_early_setup(const stru
|
|
bcm63xx_pci_enabled = 1;
|
|
if (BCMCPU_IS_6348())
|
|
val |= GPIO_MODE_6348_G2_PCI;
|
|
+
|
|
+ if (BCMCPU_IS_6368())
|
|
+ val |= GPIO_MODE_6368_PCI_REQ1 |
|
|
+ GPIO_MODE_6368_PCI_GNT1 |
|
|
+ GPIO_MODE_6368_PCI_INTB |
|
|
+ GPIO_MODE_6368_PCI_REQ0 |
|
|
+ GPIO_MODE_6368_PCI_GNT0;
|
|
}
|
|
#endif
|
|
|
|
if (board.has_pccard) {
|
|
if (BCMCPU_IS_6348())
|
|
val |= GPIO_MODE_6348_G1_MII_PCCARD;
|
|
+
|
|
+ if (BCMCPU_IS_6368())
|
|
+ val |= GPIO_MODE_6368_PCMCIA_CD1 |
|
|
+ GPIO_MODE_6368_PCMCIA_CD2 |
|
|
+ GPIO_MODE_6368_PCMCIA_VS1 |
|
|
+ GPIO_MODE_6368_PCMCIA_VS2;
|
|
}
|
|
|
|
if (board.has_enet0 && !board.enet0.use_internal_phy) {
|