bcm63xx: add initial support for bcm6368 boards
SVN-Revision: 31132
This commit is contained in:
parent
68f268a5eb
commit
c7ae2fccb6
@ -0,0 +1,130 @@
|
||||
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
|
||||
@@ -2015,6 +2015,80 @@ static struct board_info __initdata boar
|
||||
#endif
|
||||
|
||||
/*
|
||||
+ * known 6368 boards
|
||||
+ */
|
||||
+#ifdef CONFIG_BCM63XX_CPU_6368
|
||||
+static struct board_info __initdata board_96368mvwg = {
|
||||
+ .name = "96368MVWG",
|
||||
+ .expected_cpu_id = 0x6368,
|
||||
+
|
||||
+ .has_uart0 = 1,
|
||||
+ .has_pci = 1,
|
||||
+ .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,
|
||||
+ .external_phy = 1,
|
||||
+ .name = "port0",
|
||||
+ },
|
||||
+
|
||||
+ [5] = {
|
||||
+ .used = 1,
|
||||
+ .phy_id = 0x11,
|
||||
+ .external_phy = 1,
|
||||
+ .name = "port3",
|
||||
+ },
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+ .leds = {
|
||||
+ {
|
||||
+ .name = "adsl",
|
||||
+ .gpio = 2,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "ppp",
|
||||
+ .gpio = 5,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "power",
|
||||
+ .gpio = 22,
|
||||
+ .active_low = 1,
|
||||
+ .default_trigger = "default-on",
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "wps",
|
||||
+ .gpio = 23,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "ppp-fail",
|
||||
+ .gpio = 31,
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+ .has_ohci0 = 1,
|
||||
+ .has_ehci0 = 1,
|
||||
+};
|
||||
+#endif
|
||||
+
|
||||
+/*
|
||||
* all boards
|
||||
*/
|
||||
static const struct board_info __initdata *bcm963xx_boards[] = {
|
||||
@@ -2063,6 +2137,10 @@ static const struct board_info __initdat
|
||||
&board_HW553,
|
||||
&board_spw303v,
|
||||
#endif
|
||||
+
|
||||
+#ifdef CONFIG_BCM63XX_CPU_6368
|
||||
+ &board_96368mvwg,
|
||||
+#endif
|
||||
};
|
||||
|
||||
static void __init nb4_nvram_fixup(void)
|
||||
@@ -2280,12 +2358,25 @@ void __init board_prom_init(void)
|
||||
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) {
|
@ -0,0 +1,92 @@
|
||||
From f457fc2eb9bb915b5a4d251c7c68d4694cf07b01 Mon Sep 17 00:00:00 2001
|
||||
From: Maxime Bizon <mbizon@freebox.fr>
|
||||
Date: Fri, 4 Nov 2011 12:33:48 +0100
|
||||
Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
|
||||
|
||||
---
|
||||
arch/mips/bcm63xx/boards/board_bcm963xx.c | 67 +++++++++++++++++++++++++++++
|
||||
1 files changed, 67 insertions(+), 0 deletions(-)
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2086,6 +2086,72 @@ static struct board_info __initdata boar
|
||||
.has_ohci0 = 1,
|
||||
.has_ehci0 = 1,
|
||||
};
|
||||
+
|
||||
+static struct board_info __initdata board_96368mvngr = {
|
||||
+ .name = "96368MVNgr",
|
||||
+ .expected_cpu_id = 0x6368,
|
||||
+
|
||||
+ .has_uart0 = 1,
|
||||
+ .has_pci = 1,
|
||||
+ .has_enetsw = 1,
|
||||
+
|
||||
+ .enetsw = {
|
||||
+ .used_ports = {
|
||||
+ [0] = {
|
||||
+ .used = 1,
|
||||
+ .phy_id = 1,
|
||||
+ .name = "port1",
|
||||
+ },
|
||||
+
|
||||
+ [1] = {
|
||||
+ .used = 1,
|
||||
+ .phy_id = 2,
|
||||
+ .name = "port2",
|
||||
+ },
|
||||
+
|
||||
+ [2] = {
|
||||
+ .used = 1,
|
||||
+ .phy_id = 3,
|
||||
+ .name = "port3",
|
||||
+ },
|
||||
+
|
||||
+ [3] = {
|
||||
+ .used = 1,
|
||||
+ .phy_id = 4,
|
||||
+ .name = "port4",
|
||||
+ },
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+ .leds = {
|
||||
+ {
|
||||
+ .name = "adsl",
|
||||
+ .gpio = 2,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "inet",
|
||||
+ .gpio = 5,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "power",
|
||||
+ .gpio = 22,
|
||||
+ .default_trigger = "default-on",
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "wps",
|
||||
+ .gpio = 23,
|
||||
+ .active_low = 1,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "inet-fail",
|
||||
+ .gpio = 3,
|
||||
+ },
|
||||
+ },
|
||||
+
|
||||
+ .has_ohci0 = 1,
|
||||
+ .has_ehci0 = 1,
|
||||
+};
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -2140,6 +2206,7 @@ static const struct board_info __initdat
|
||||
|
||||
#ifdef CONFIG_BCM63XX_CPU_6368
|
||||
&board_96368mvwg,
|
||||
+ &board_96368mvngr,
|
||||
#endif
|
||||
};
|
||||
|
@ -22,7 +22,7 @@
|
||||
* known 6338 boards
|
||||
*/
|
||||
#ifdef CONFIG_BCM63XX_CPU_6338
|
||||
@@ -2344,6 +2352,7 @@ void __init board_prom_init(void)
|
||||
@@ -2489,6 +2497,7 @@ void __init board_prom_init(void)
|
||||
|
||||
/* extract nvram data */
|
||||
memcpy(&nvram, boot_addr + BCM963XX_NVRAM_OFFSET, sizeof(nvram));
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2211,7 +2211,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
@@ -2356,7 +2356,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
* bcm4318 WLAN work
|
||||
*/
|
||||
#ifdef CONFIG_SSB_PCIHOST
|
||||
@ -9,7 +9,7 @@
|
||||
.revision = 0x02,
|
||||
.board_rev = 0x17,
|
||||
.country_code = 0x0,
|
||||
@@ -2231,6 +2231,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
@@ -2376,6 +2376,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
.boardflags_lo = 0x2848,
|
||||
.boardflags_hi = 0x0000,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user