brcm63xx: remove now obsolete board fixup code

Now that we migrated all users to dtb based detection, we can drop the
board fixup code.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 42129
This commit is contained in:
Jonas Gorski 2014-08-11 11:37:26 +00:00
parent 74ec41ef59
commit 43029544e2
66 changed files with 172 additions and 244 deletions

View file

@ -55,16 +55,6 @@ define Image/Build/CFEDTB
$(7) $(8) $(9) $(10)
endef
define Image/Build/CFEFIXUP
# Generate the tagged image
$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \
--output $(BIN_DIR)/openwrt-$(5)-$(1)-cfe.bin \
--boardid $(2) --chipid $(4) --entry $(KERNEL_ENTRY) \
--load-addr $(LOADADDR) --rsa-signature "$(6)" \
--info1 "+$(call Image/LimitName16,$(3))" --info2 $(1) \
$(7) $(8) $(9) $(10)
endef
define Image/Build/CFEHW553
# Generate the tagged image
$(STAGING_DIR_HOST)/bin/imagetag -i $(KDIR)/vmlinux.lzma.cfe -f $(KDIR)/root.$(1) \

View file

@ -1,62 +0,0 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -23,6 +23,7 @@
#include "board_common.h"
#include <uapi/linux/bcm933xx_hcs.h>
+#include <uapi/linux/bcm963xx_tag.h>
#define PFX "board_bcm963xx: "
@@ -31,6 +32,9 @@
#define BCM963XX_KEYS_POLL_INTERVAL 20
#define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
+#define CFE_OFFSET_64K 0x10000
+#define CFE_OFFSET_128K 0x20000
+
/*
* known 3368 boards
*/
@@ -722,6 +726,30 @@ static const struct board_info __initcon
#endif
};
+static void __init boardid_fixup(u8 *boot_addr)
+{
+ struct bcm_tag *tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_64K);
+ char *board_name = (char *)bcm63xx_nvram_get_name();
+
+ /* check if bcm_tag is at 64k offset */
+ if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
+ /* else try 128k */
+ tag = (struct bcm_tag *)(boot_addr + CFE_OFFSET_128K);
+ if (strncmp(board_name, tag->board_id, BOARDID_LEN) != 0) {
+ /* No tag found */
+ printk(KERN_DEBUG "No bcm_tag found!\n");
+ return;
+ }
+ }
+ /* check if we should override the boardid */
+ if (tag->information1[0] != '+')
+ return;
+
+ strncpy(board_name, &tag->information1[1], BOARDID_LEN);
+
+ printk(KERN_INFO "Overriding boardid with '%s'\n", board_name);
+}
+
/*
* early init callback, read nvram data from flash and checksum it
*/
@@ -760,6 +788,10 @@ void __init board_prom_init(void)
hcs = (struct bcm_hcs *)boot_addr;
board_name = hcs->filename;
} else {
+ if (strcmp(cfe_version, "unknown") != 0) {
+ /* cfe present */
+ boardid_fixup(boot_addr);
+ }
board_name = bcm63xx_nvram_get_name();
}
/* find board by name */

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -134,28 +134,28 @@ static struct board_info __initdata boar
@@ -130,28 +130,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -34,7 +34,7 @@
.gpio = 1,
.active_low = 1,
}
@@ -175,28 +175,28 @@ static struct board_info __initdata boar
@@ -171,28 +171,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -68,7 +68,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -235,29 +235,29 @@ static struct board_info __initdata boar
@@ -231,29 +231,29 @@ static struct board_info __initdata boar
.leds = {
{
@ -103,7 +103,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -296,28 +296,28 @@ static struct board_info __initdata boar
@@ -292,28 +292,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -137,7 +137,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -350,28 +350,28 @@ static struct board_info __initdata boar
@@ -346,28 +346,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -171,7 +171,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -418,28 +418,28 @@ static struct board_info __initdata boar
@@ -414,28 +414,28 @@ static struct board_info __initdata boar
.leds = {
{
@ -205,7 +205,7 @@
.gpio = 1,
.active_low = 1,
},
@@ -571,27 +571,27 @@ static struct board_info __initdata boar
@@ -567,27 +567,27 @@ static struct board_info __initdata boar
.leds = {
{
@ -238,7 +238,7 @@
.gpio = 5,
},
},
@@ -623,22 +623,22 @@ static struct board_info __initdata boar
@@ -619,22 +619,22 @@ static struct board_info __initdata boar
.leds = {
{

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -775,10 +775,20 @@ void __init board_prom_init(void)
@@ -747,10 +747,20 @@ void __init board_prom_init(void)
/* dump cfe version */
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;

View file

@ -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
@@ -765,7 +765,7 @@ void __init board_prom_init(void)
@@ -737,7 +737,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
*/

View file

@ -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
@@ -765,7 +765,7 @@ void __init board_prom_init(void)
@@ -737,7 +737,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
*/

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -620,6 +620,7 @@ static struct board_info __initdata boar
@@ -616,6 +616,7 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_pccard = 1,
.has_ehci0 = 1,

View file

@ -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
@@ -754,7 +754,7 @@ static void __init boardid_fixup(u8 *boo
@@ -726,7 +726,7 @@ static const struct board_info __initcon
/*
* early init callback, read nvram data from flash and checksum it
*/

View file

@ -18,7 +18,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
@@ -78,6 +78,7 @@ static struct board_info __initdata boar
@@ -74,6 +74,7 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_pci = 1,
.has_usbd = 0,
@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.usbd = {
.use_fullspeed = 0,
@@ -227,6 +228,7 @@ static struct board_info __initdata boar
@@ -223,6 +224,7 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.has_pci = 1,
@ -34,7 +34,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.enet0 = {
.has_phy = 1,
@@ -272,6 +274,7 @@ static struct board_info __initdata boar
@@ -268,6 +270,7 @@ static struct board_info __initdata boar
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@ -42,7 +42,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.enet0 = {
.has_phy = 1,
@@ -332,6 +335,7 @@ static struct board_info __initdata boar
@@ -328,6 +331,7 @@ static struct board_info __initdata boar
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@ -50,7 +50,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.enet0 = {
.has_phy = 1,
@@ -396,6 +400,7 @@ static struct board_info __initdata boar
@@ -392,6 +396,7 @@ static struct board_info __initdata boar
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@ -58,7 +58,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.enet0 = {
.has_phy = 1,
@@ -464,6 +469,7 @@ static struct board_info __initdata boar
@@ -460,6 +465,7 @@ static struct board_info __initdata boar
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.enet0 = {
.has_phy = 1,
@@ -487,6 +493,7 @@ static struct board_info __initdata boar
@@ -483,6 +489,7 @@ static struct board_info __initdata boar
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@ -74,7 +74,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
.enet0 = {
.has_phy = 1,
@@ -505,6 +512,7 @@ static struct board_info __initdata boar
@@ -501,6 +508,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,
@@ -527,6 +535,7 @@ static struct board_info __initdata boar
@@ -523,6 +531,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,
@@ -553,6 +562,7 @@ static struct board_info __initdata boar
@@ -549,6 +558,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,
@@ -605,6 +615,7 @@ static struct board_info __initdata boar
@@ -601,6 +611,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,
@@ -676,6 +687,7 @@ static struct board_info __initdata boar
@@ -672,6 +683,7 @@ static struct board_info __initdata boar
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,

View file

@ -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
@@ -817,9 +817,9 @@ void __init board_bcm963xx_init(void)
}
@@ -785,9 +785,9 @@ void __init board_bcm963xx_init(void)
} else {
board_name = bcm63xx_nvram_get_name();
}
- /* find board by name */

View file

@ -9,7 +9,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -41,6 +41,7 @@
@@ -37,6 +37,7 @@
#ifdef CONFIG_BCM63XX_CPU_3368
static struct board_info __initdata board_cvg834g = {
.name = "CVG834G_E15R3921",
@ -17,7 +17,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x3368,
.has_uart0 = 1,
@@ -73,6 +74,7 @@ static struct board_info __initdata boar
@@ -69,6 +70,7 @@ static struct board_info __initdata boar
#ifdef CONFIG_BCM63XX_CPU_6328
static struct board_info __initdata board_96328avng = {
.name = "96328avng",
@ -25,7 +25,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6328,
.has_uart0 = 1,
@@ -122,6 +124,7 @@ static struct board_info __initdata boar
@@ -118,6 +120,7 @@ static struct board_info __initdata boar
#ifdef CONFIG_BCM63XX_CPU_6338
static struct board_info __initdata board_96338gw = {
.name = "96338GW",
@ -33,7 +33,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6338,
.has_uart0 = 1,
@@ -165,6 +168,7 @@ static struct board_info __initdata boar
@@ -161,6 +164,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_96338w = {
.name = "96338W",
@ -41,7 +41,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6338,
.has_uart0 = 1,
@@ -211,6 +215,7 @@ static struct board_info __initdata boar
@@ -207,6 +211,7 @@ static struct board_info __initdata boar
#ifdef CONFIG_BCM63XX_CPU_6345
static struct board_info __initdata board_96345gw2 = {
.name = "96345GW2",
@ -49,7 +49,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6345,
.has_uart0 = 1,
@@ -223,6 +228,7 @@ static struct board_info __initdata boar
@@ -219,6 +224,7 @@ static struct board_info __initdata boar
#ifdef CONFIG_BCM63XX_CPU_6348
static struct board_info __initdata board_96348r = {
.name = "96348R",
@ -57,7 +57,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_uart0 = 1,
@@ -268,6 +274,7 @@ static struct board_info __initdata boar
@@ -264,6 +270,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_96348gw_10 = {
.name = "96348GW-10",
@ -65,7 +65,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_uart0 = 1,
@@ -329,6 +336,7 @@ static struct board_info __initdata boar
@@ -325,6 +332,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_96348gw_11 = {
.name = "96348GW-11",
@ -73,7 +73,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_uart0 = 1,
@@ -394,6 +402,7 @@ static struct board_info __initdata boar
@@ -390,6 +398,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
@ -81,7 +81,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_uart0 = 1,
@@ -463,6 +472,7 @@ static struct board_info __initdata boar
@@ -459,6 +468,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
@ -89,7 +89,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_uart0 = 1,
@@ -488,6 +498,7 @@ static struct board_info __initdata boar
@@ -484,6 +494,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
@ -97,7 +97,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_enet0 = 1,
@@ -508,6 +519,7 @@ static struct board_info __initdata boar
@@ -504,6 +515,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_DV201AMR = {
.name = "DV201AMR",
@ -105,7 +105,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_uart0 = 1,
@@ -529,6 +541,7 @@ static struct board_info __initdata boar
@@ -525,6 +537,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_96348gw_a = {
.name = "96348GW-A",
@ -113,7 +113,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6348,
.has_uart0 = 1,
@@ -556,6 +569,7 @@ static struct board_info __initdata boar
@@ -552,6 +565,7 @@ static struct board_info __initdata boar
#ifdef CONFIG_BCM63XX_CPU_6358
static struct board_info __initdata board_96358vw = {
.name = "96358VW",
@ -121,7 +121,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6358,
.has_uart0 = 1,
@@ -609,6 +623,7 @@ static struct board_info __initdata boar
@@ -605,6 +619,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_96358vw2 = {
.name = "96358VW2",
@ -129,7 +129,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6358,
.has_uart0 = 1,
@@ -659,6 +674,7 @@ static struct board_info __initdata boar
@@ -655,6 +670,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
@ -137,7 +137,7 @@ Subject: [PATCH 48/48] MIPS: BCM63XX: add of_board_ids for all supported boards
.expected_cpu_id = 0x6358,
.has_uart0 = 1,
@@ -682,6 +698,7 @@ static struct board_info __initdata boar
@@ -678,6 +694,7 @@ static struct board_info __initdata boar
static struct board_info __initdata board_DWVS0 = {
.name = "DWV-S0",

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -66,7 +66,7 @@ static struct board_info __initdata boar
@@ -62,7 +62,7 @@ static struct board_info __initdata boar
.ephy_reset_gpio = 36,
.ephy_reset_gpio_flags = GPIOF_INIT_HIGH,
};
@ -9,7 +9,7 @@
/*
* known 6328 boards
@@ -116,7 +116,7 @@ static struct board_info __initdata boar
@@ -112,7 +112,7 @@ static struct board_info __initdata boar
},
},
};
@ -18,7 +18,7 @@
/*
* known 6338 boards
@@ -207,7 +207,7 @@ static struct board_info __initdata boar
@@ -203,7 +203,7 @@ static struct board_info __initdata boar
},
},
};
@ -27,7 +27,7 @@
/*
* known 6345 boards
@@ -220,7 +220,7 @@ static struct board_info __initdata boar
@@ -216,7 +216,7 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
@ -36,7 +36,7 @@
/*
* known 6348 boards
@@ -561,7 +561,7 @@ static struct board_info __initdata boar
@@ -557,7 +557,7 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -45,7 +45,7 @@
/*
* known 6358 boards
@@ -718,7 +718,7 @@ static struct board_info __initdata boar
@@ -714,7 +714,7 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -561,6 +561,56 @@ static struct board_info __initdata boar
@@ -557,6 +557,56 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -57,7 +57,7 @@
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
@@ -746,6 +796,7 @@ static const struct board_info __initcon
@@ -742,6 +792,7 @@ static const struct board_info __initcon
&board_DV201AMR,
&board_96348gw_a,
&board_rta1025w_16,

View file

@ -13,9 +13,9 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -35,6 +41,12 @@
#define CFE_OFFSET_64K 0x10000
#define CFE_OFFSET_128K 0x20000
@@ -31,6 +37,12 @@
#define BCM963XX_KEYS_POLL_INTERVAL 20
#define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3)
+#define NB4_PID_OFFSET 0xff80
+#define NB4_74X164_GPIO_BASE 64
@ -26,7 +26,7 @@
/*
* known 3368 boards
*/
@@ -768,6 +780,270 @@ static struct board_info __initdata boar
@@ -764,6 +776,270 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -297,7 +297,7 @@
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
@@ -804,6 +1080,8 @@ static const struct board_info __initcon
@@ -800,6 +1076,8 @@ static const struct board_info __initcon
&board_96358vw2,
&board_AGPFS0,
&board_DWVS0,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -219,6 +219,40 @@ static struct board_info __initdata boar
@@ -215,6 +215,40 @@ static struct board_info __initdata boar
},
},
};
@ -41,7 +41,7 @@
#endif /* CONFIG_BCM63XX_CPU_6338 */
/*
@@ -1059,6 +1093,7 @@ static const struct board_info __initcon
@@ -1055,6 +1089,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6338
&board_96338gw,
&board_96338w,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -768,6 +768,98 @@ static struct board_info __initdata boar
@@ -764,6 +764,98 @@ static struct board_info __initdata boar
},
};
@ -99,7 +99,7 @@
static struct board_info __initdata board_AGPFS0 = {
.name = "AGPF-S0",
.of_board_id = "pirelli,agpf-s0",
@@ -1114,6 +1206,7 @@ static const struct board_info __initcon
@@ -1110,6 +1202,7 @@ static const struct board_info __initcon
&board_96358vw,
&board_96358vw2,
&board_AGPFS0,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -907,6 +907,62 @@ static struct board_info __initdata boar
@@ -903,6 +903,62 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -63,7 +63,7 @@
struct spi_gpio_platform_data nb4_spi_gpio_data = {
.sck = NB4_SPI_GPIO_CLK,
.mosi = NB4_SPI_GPIO_MOSI,
@@ -1208,6 +1264,7 @@ static const struct board_info __initcon
@@ -1204,6 +1260,7 @@ static const struct board_info __initcon
&board_AGPFS0,
&board_CPVA642,
&board_DWVS0,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -657,6 +657,68 @@ static struct board_info __initdata boar
@@ -653,6 +653,68 @@ static struct board_info __initdata boar
},
},
};
@ -69,7 +69,7 @@
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
@@ -1256,6 +1318,7 @@ static const struct board_info __initcon
@@ -1252,6 +1314,7 @@ static const struct board_info __initcon
&board_96348gw_a,
&board_rta1025w_16,
&board_96348_D4PW,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -516,6 +516,114 @@ static struct board_info __initdata boar
@@ -512,6 +512,114 @@ static struct board_info __initdata boar
},
};
@ -115,7 +115,7 @@
static struct board_info __initdata board_FAST2404 = {
.name = "F@ST2404",
.of_board_id = "sagem,f@st2404",
@@ -1311,6 +1419,8 @@ static const struct board_info __initcon
@@ -1307,6 +1415,8 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6348
&board_96348r,
&board_96348gw,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -827,6 +827,78 @@ static struct board_info __initdata boar
@@ -823,6 +823,78 @@ static struct board_info __initdata boar
},
},
};
@ -79,7 +79,7 @@
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
@@ -1429,6 +1501,7 @@ static const struct board_info __initcon
@@ -1425,6 +1497,7 @@ static const struct board_info __initcon
&board_rta1025w_16,
&board_96348_D4PW,
&board_spw500v,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1468,6 +1468,83 @@ static struct board_info __initdata boar
@@ -1464,6 +1464,83 @@ static struct board_info __initdata boar
.spis = nb4_spi_devices,
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@ -84,7 +84,7 @@
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
@@ -1513,6 +1590,7 @@ static const struct board_info __initcon
@@ -1509,6 +1586,7 @@ static const struct board_info __initcon
&board_dsl_274xb_rev_c,
&board_nb4_ser_r0,
&board_nb4_fxc_r1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -253,6 +253,45 @@ static struct board_info __initdata boar
@@ -249,6 +249,45 @@ static struct board_info __initdata boar
},
},
};
@ -46,7 +46,7 @@
#endif /* CONFIG_BCM63XX_CPU_6338 */
/*
@@ -1561,6 +1600,7 @@ static const struct board_info __initcon
@@ -1557,6 +1596,7 @@ static const struct board_info __initcon
&board_96338gw,
&board_96338w,
&board_96338w2_e7t,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1584,6 +1584,72 @@ static struct board_info __initdata boar
@@ -1580,6 +1580,72 @@ static struct board_info __initdata boar
.pci_dev = 1,
},
};
@ -73,7 +73,7 @@
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
@@ -1631,6 +1697,7 @@ static const struct board_info __initcon
@@ -1627,6 +1693,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_HW553,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -938,6 +938,65 @@ static struct board_info __initdata boar
@@ -934,6 +934,65 @@ static struct board_info __initdata boar
},
},
};
@ -66,7 +66,7 @@
#endif /* CONFIG_BCM63XX_CPU_6348 */
/*
@@ -1685,6 +1744,7 @@ static const struct board_info __initcon
@@ -1681,6 +1740,7 @@ static const struct board_info __initcon
&board_96348_D4PW,
&board_spw500v,
&board_96348sv,
@ -74,7 +74,7 @@
#endif
#ifdef CONFIG_BCM63XX_CPU_6358
@@ -1747,6 +1807,22 @@ void __init board_bcm963xx_init(void)
@@ -1719,6 +1779,22 @@ void __init board_bcm963xx_init(void)
val &= MPI_CSBASE_BASE_MASK;
}
boot_addr = (u8 *)KSEG1ADDR(val);

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -485,6 +485,64 @@ static struct board_info __initdata boar
@@ -481,6 +481,64 @@ static struct board_info __initdata boar
},
};
@ -65,7 +65,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.of_board_id = "brcm,bcm96348gw",
@@ -1745,6 +1803,7 @@ static const struct board_info __initcon
@@ -1741,6 +1799,7 @@ static const struct board_info __initcon
&board_spw500v,
&board_96348sv,
&board_V2500V_BB,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -543,6 +543,59 @@ static struct board_info __initdata boar
@@ -539,6 +539,59 @@ static struct board_info __initdata boar
};
@ -60,7 +60,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.of_board_id = "brcm,bcm96348gw",
@@ -1804,6 +1857,7 @@ static const struct board_info __initcon
@@ -1800,6 +1853,7 @@ static const struct board_info __initcon
&board_96348sv,
&board_V2500V_BB,
&board_V2110,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1340,6 +1340,8 @@ static struct board_info __initdata boar
@@ -1336,6 +1336,8 @@ static struct board_info __initdata boar
.of_board_id = "pirelli,a226g",
.expected_cpu_id = 0x6358,
@ -9,7 +9,7 @@
.has_enet0 = 1,
.has_enet1 = 1,
.has_pci = 1,
@@ -1356,6 +1358,7 @@ static struct board_info __initdata boar
@@ -1352,6 +1354,7 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -596,6 +596,76 @@ static struct board_info __initdata boar
@@ -592,6 +592,76 @@ static struct board_info __initdata boar
},
};
@ -77,7 +77,7 @@
static struct board_info __initdata board_96348gw = {
.name = "96348GW",
.of_board_id = "brcm,bcm96348gw",
@@ -1861,6 +1931,7 @@ static const struct board_info __initcon
@@ -1857,6 +1927,7 @@ static const struct board_info __initcon
&board_V2500V_BB,
&board_V2110,
&board_ct536_ct5621,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -875,6 +875,7 @@ static struct board_info __initdata boar
@@ -871,6 +871,7 @@ static struct board_info __initdata boar
.of_board_id = "dynalink,rta1025w",
.expected_cpu_id = 0x6348,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -542,6 +542,40 @@ static struct board_info __initdata boar
@@ -538,6 +538,40 @@ static struct board_info __initdata boar
},
};
@ -41,7 +41,7 @@
static struct board_info __initdata board_ct536_ct5621 = {
.name = "CT536_CT5621",
@@ -1933,6 +1967,7 @@ static const struct board_info __initcon
@@ -1929,6 +1963,7 @@ static const struct board_info __initcon
&board_V2110,
&board_ct536_ct5621,
&board_96348A_122,

View file

@ -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
@@ -1931,6 +1931,85 @@ static struct board_info __initdata boar
@@ -1927,6 +1927,85 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
@ -96,7 +96,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
@@ -1982,6 +2061,10 @@ static const struct board_info __initcon
@@ -1978,6 +2057,10 @@ static const struct board_info __initcon
&board_HW553,
&board_spw303v,
#endif
@ -106,7 +106,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
+#endif
};
static void __init boardid_fixup(u8 *boot_addr)
/*
--- a/arch/mips/bcm63xx/boards/board_common.c
+++ b/arch/mips/bcm63xx/boards/board_common.c
@@ -88,12 +88,25 @@ void __init board_early_setup(const stru

View file

@ -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
@@ -2007,6 +2007,72 @@ static struct board_info __initdata boar
@@ -2003,6 +2003,72 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@ -82,7 +82,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
@@ -2064,6 +2130,7 @@ static const struct board_info __initcon
@@ -2060,6 +2126,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,

View file

@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -99,13 +99,45 @@ static struct board_info __initdata boar
@@ -95,13 +95,45 @@ static struct board_info __initdata boar
.port_no = 0,
},
@ -56,7 +56,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
.name = "96328avng::power",
.gpio = 4,
.active_low = 1,
@@ -122,7 +154,7 @@ static struct board_info __initdata boar
@@ -118,7 +150,7 @@ static struct board_info __initdata boar
.active_low = 1,
},
{

View file

@ -9,7 +9,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -160,6 +160,76 @@ static struct board_info __initdata boar
@@ -156,6 +156,76 @@ static struct board_info __initdata boar
},
},
};
@ -86,7 +86,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
@@ -2116,6 +2186,7 @@ static const struct board_info __initcon
@@ -2112,6 +2182,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -10,7 +10,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -230,6 +230,111 @@ static struct board_info __initdata boar
@@ -226,6 +226,111 @@ static struct board_info __initdata boar
},
};
@ -122,7 +122,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
@@ -2187,6 +2292,7 @@ static const struct board_info __initcon
@@ -2183,6 +2288,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1178,6 +1178,59 @@ static struct board_info __initdata boar
@@ -1174,6 +1174,59 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
};
@ -60,7 +60,7 @@
static struct board_info __initdata board_96348_D4PW = {
.name = "D-4P-W",
.expected_cpu_id = 0x6348,
@@ -2322,6 +2375,7 @@ static const struct board_info __initcon
@@ -2318,6 +2371,7 @@ static const struct board_info __initcon
&board_ct536_ct5621,
&board_96348A_122,
&board_CPVA502plus,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -47,6 +47,12 @@
@@ -43,6 +43,12 @@
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
@ -13,7 +13,7 @@
/*
* known 3368 boards
*/
@@ -2046,6 +2052,124 @@ static struct board_info __initdata boar
@@ -2042,6 +2048,124 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(nb4_spi_devices),
};
@ -138,7 +138,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
@@ -2387,6 +2511,7 @@ static const struct board_info __initcon
@@ -2383,6 +2507,7 @@ static const struct board_info __initcon
&board_dsl_274xb_rev_c,
&board_nb4_ser_r0,
&board_nb4_fxc_r1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2312,6 +2312,74 @@ static struct board_info __initdata boar
@@ -2308,6 +2308,74 @@ static struct board_info __initdata boar
},
}
};
@ -75,7 +75,7 @@
#endif /* CONFIG_BCM63XX_CPU_6358 */
/*
@@ -2514,6 +2582,7 @@ static const struct board_info __initcon
@@ -2510,6 +2578,7 @@ static const struct board_info __initcon
&board_ct6373_1,
&board_HW553,
&board_spw303v,

View file

@ -8,7 +8,7 @@
#include <asm/addrspace.h>
#include <bcm63xx_board.h>
#include <bcm63xx_cpu.h>
@@ -46,6 +47,8 @@
@@ -42,6 +43,8 @@
#define NB4_SPI_GPIO_MOSI 7
#define NB4_SPI_GPIO_CLK 6
#define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X))
@ -17,7 +17,7 @@
#define CT6373_PID_OFFSET 0xff80
#define CT6373_74X164_GPIO_BASE 64
@@ -2382,6 +2385,105 @@ static struct board_info __initdata boar
@@ -2378,6 +2381,105 @@ static struct board_info __initdata boar
};
#endif /* CONFIG_BCM63XX_CPU_6358 */
@ -123,7 +123,7 @@
/*
* known 6368 boards
*/
@@ -2585,6 +2687,10 @@ static const struct board_info __initcon
@@ -2581,6 +2683,10 @@ static const struct board_info __initcon
&board_DVAG3810BN,
#endif

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1120,6 +1120,57 @@ static struct board_info __initdata boar
@@ -1116,6 +1116,57 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@ -58,7 +58,7 @@
static struct board_info __initdata board_rta1025w_16 = {
.name = "RTA1025W_16",
.of_board_id = "dynalink,rta1025w",
@@ -2658,6 +2709,7 @@ static const struct board_info __initcon
@@ -2654,6 +2705,7 @@ static const struct board_info __initcon
&board_96348gw_10,
&board_96348gw_11,
&board_FAST2404,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -240,6 +240,133 @@ static struct board_info __initdata boar
@@ -236,6 +236,133 @@ static struct board_info __initdata boar
},
};
@ -134,7 +134,7 @@
static struct board_info __initdata board_dsl_274xb_f1 = {
.name = "AW4339U",
.expected_cpu_id = 0x6328,
@@ -2690,6 +2817,7 @@ static const struct board_info __initcon
@@ -2686,6 +2813,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,
&board_963281TAN,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -170,6 +170,115 @@ static struct board_info __initdata boar
@@ -166,6 +166,115 @@ static struct board_info __initdata boar
},
};
@ -116,7 +116,7 @@
static struct board_info __initdata board_963281TAN = {
.name = "963281TAN",
.expected_cpu_id = 0x6328,
@@ -2816,6 +2925,7 @@ static const struct board_info __initcon
@@ -2812,6 +2921,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -170,6 +170,91 @@ static struct board_info __initdata boar
@@ -166,6 +166,91 @@ static struct board_info __initdata boar
},
};
@ -92,7 +92,7 @@
static struct sprom_fixup __initdata ar5387un_fixups[] = {
{ .offset = 2, .value = 0x05bb },
{ .offset = 65, .value = 0x1204 },
@@ -2925,6 +3010,7 @@ static const struct board_info __initcon
@@ -2921,6 +3006,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6328
&board_96328avng,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -842,6 +842,55 @@ static struct board_info __initdata boar
@@ -838,6 +838,55 @@ static struct board_info __initdata boar
.has_uart0 = 1,
};
@ -56,7 +56,7 @@
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
@@ -3024,6 +3073,7 @@ static const struct board_info __initcon
@@ -3020,6 +3069,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,

View file

@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
@@ -2671,6 +2672,495 @@ static struct board_info __initdata boar
@@ -2667,6 +2668,495 @@ static struct board_info __initdata boar
},
};
@ -504,7 +504,7 @@
/* T-Home Speedport W 303V Typ B */
static struct board_info __initdata board_spw303v = {
.name = "96358-502V",
@@ -3109,6 +3599,10 @@ static const struct board_info __initcon
@@ -3105,6 +3595,10 @@ static const struct board_info __initcon
&board_nb4_fxc_r1,
&board_ct6373_1,
&board_HW553,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -892,6 +892,60 @@ static struct board_info __initdata boar
@@ -888,6 +888,60 @@ static struct board_info __initdata boar
},
},
};
@ -61,7 +61,7 @@
#endif /* CONFIG_BCM63XX_CPU_6345 */
/*
@@ -3564,6 +3618,7 @@ static const struct board_info __initcon
@@ -3560,6 +3614,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6345
&board_96345gw2,
&board_rta770bw,

View file

@ -12,7 +12,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -666,6 +666,122 @@ static struct board_info __initdata boar
@@ -662,6 +662,122 @@ static struct board_info __initdata boar
},
},
};
@ -135,7 +135,7 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
#endif /* CONFIG_BCM63XX_CPU_6328 */
/*
@@ -3608,6 +3724,7 @@ static const struct board_info __initcon
@@ -3604,6 +3720,7 @@ static const struct board_info __initcon
&board_963281TAN,
&board_A4001N1,
&board_dsl_274xb_f1,

View file

@ -6,7 +6,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -3563,6 +3563,96 @@ static struct board_info __initdata boar
@@ -3559,6 +3559,96 @@ static struct board_info __initdata boar
.devs = nb6_devices,
.num_devs = ARRAY_SIZE(nb6_devices),
};
@ -103,7 +103,7 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
#endif /* CONFIG_BCM63XX_CPU_6362 */
/*
@@ -3781,6 +3871,7 @@ static const struct board_info __initcon
@@ -3777,6 +3867,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6362
&board_nb6,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2299,6 +2299,99 @@ static struct board_info __initdata boar
@@ -2295,6 +2295,99 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1777,6 +1777,19 @@ static struct board_info __initdata boar
@@ -1773,6 +1773,19 @@ static struct board_info __initdata boar
},
.has_ohci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1174,6 +1174,17 @@ static struct board_info __initdata boar
@@ -1170,6 +1170,17 @@ static struct board_info __initdata boar
.active_low = 1,
},
},

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -796,6 +796,8 @@ static struct board_info __initdata boar
@@ -792,6 +792,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@ -9,7 +9,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -840,6 +842,8 @@ static struct board_info __initdata boar
@@ -836,6 +838,8 @@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
@ -18,7 +18,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1130,6 +1134,8 @@ static struct board_info __initdata boar
@@ -1126,6 +1130,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -27,7 +27,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1204,6 +1210,8 @@ static struct board_info __initdata boar
@@ -1200,6 +1206,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -36,7 +36,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1484,6 +1492,8 @@ static struct board_info __initdata boar
@@ -1480,6 +1488,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -45,7 +45,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1663,6 +1673,8 @@ static struct board_info __initdata boar
@@ -1659,6 +1669,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -54,7 +54,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1739,6 +1751,8 @@ static struct board_info __initdata boar
@@ -1735,6 +1747,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -63,7 +63,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1762,6 +1776,8 @@ static struct board_info __initdata boar
@@ -1758,6 +1772,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -72,7 +72,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1783,6 +1799,8 @@ static struct board_info __initdata boar
@@ -1779,6 +1795,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
@ -81,7 +81,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2121,6 +2139,8 @@ static struct board_info __initdata boar
@@ -2117,6 +2135,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -90,7 +90,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2175,6 +2195,8 @@ static struct board_info __initdata boar
@@ -2171,6 +2191,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -99,7 +99,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2317,6 +2339,8 @@ static struct board_info __initdata boar
@@ -2313,6 +2335,8 @@ static struct board_info __initdata boar
},
.enet1 = {
@ -108,7 +108,7 @@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -2436,6 +2460,8 @@ static struct board_info __initdata boar
@@ -2432,6 +2456,8 @@ static struct board_info __initdata boar
},
.enet1 = {

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -2468,6 +2468,94 @@ static struct board_info __initdata boar
@@ -2464,6 +2464,94 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -91,6 +91,93 @@ static struct board_info __initdata boar
@@ -87,6 +87,93 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_3368 */
/*
@ -94,7 +94,7 @@
* known 6328 boards
*/
#ifdef CONFIG_BCM63XX_CPU_6328
@@ -4038,6 +4125,9 @@ static const struct board_info __initcon
@@ -4034,6 +4121,9 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_3368
&board_cvg834g,
#endif

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -175,6 +175,94 @@ static struct board_info __initdata boar
@@ -171,6 +171,94 @@ static struct board_info __initdata boar
},
},
};
@ -95,7 +95,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
@@ -4127,6 +4215,7 @@ static const struct board_info __initcon
@@ -4123,6 +4211,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4207,6 +4207,75 @@ static struct board_info __initdata boar
@@ -4203,6 +4203,75 @@ static struct board_info __initdata boar
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
@ -76,7 +76,7 @@
* all boards
*/
static const struct board_info __initconst *bcm963xx_boards[] = {
@@ -4288,6 +4357,9 @@ static const struct board_info __initcon
@@ -4284,6 +4353,9 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
#endif
@ -85,4 +85,4 @@
+#endif
};
static void __init boardid_fixup(u8 *boot_addr)
/*

View file

@ -8,7 +8,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
---
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -1436,6 +1436,52 @@ static struct board_info __initdata boar
@@ -1432,6 +1432,52 @@ static struct board_info __initdata boar
},
};
@ -61,7 +61,7 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
/* BT Voyager 2110 */
static struct board_info __initdata board_V2110 = {
@@ -4327,6 +4373,7 @@ static const struct board_info __initcon
@@ -4323,6 +4369,7 @@ static const struct board_info __initcon
&board_96348A_122,
&board_CPVA502plus,
&board_96348W3,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4319,6 +4319,108 @@ static struct board_info __initdata boar
@@ -4315,6 +4315,108 @@ static struct board_info __initdata boar
},
},
};
@ -109,7 +109,7 @@
#endif /* CONFIG_BCM63XX_CPU_63268 */
/*
@@ -4406,6 +4508,7 @@ static const struct board_info __initcon
@@ -4402,6 +4504,7 @@ static const struct board_info __initcon
#endif
#ifdef CONFIG_BCM63XX_CPU_63268
&board_963269bhr,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4256,6 +4256,131 @@ static struct board_info __initdata boar
@@ -4252,6 +4252,131 @@ static struct board_info __initdata boar
* known 63268/63269 boards
*/
#ifdef CONFIG_BCM63XX_CPU_63268
@ -132,7 +132,7 @@
static struct board_info __initdata board_963269bhr = {
.name = "963269BHR",
.expected_cpu_id = 0x63268,
@@ -4507,6 +4632,7 @@ static const struct board_info __initcon
@@ -4503,6 +4628,7 @@ static const struct board_info __initcon
&board_96368mvngr,
#endif
#ifdef CONFIG_BCM63XX_CPU_63268

View file

@ -8,7 +8,7 @@
#include <linux/platform_device.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi_gpio.h>
@@ -4250,6 +4251,117 @@ static struct board_info __initdata boar
@@ -4246,6 +4247,117 @@ static struct board_info __initdata boar
.has_ohci0 = 1,
.has_ehci0 = 1,
};
@ -126,7 +126,7 @@
#endif /* CONFIG_BCM63XX_CPU_6368 */
/*
@@ -4630,6 +4742,7 @@ static const struct board_info __initcon
@@ -4626,6 +4738,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4252,6 +4252,116 @@ static struct board_info __initdata boar
@@ -4248,6 +4248,116 @@ static struct board_info __initdata boar
.has_ehci0 = 1,
};
@ -117,7 +117,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
@@ -4742,6 +4852,7 @@ static const struct board_info __initcon
@@ -4738,6 +4848,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4362,6 +4362,116 @@ static struct board_info __initdata boar
@@ -4358,6 +4358,116 @@ static struct board_info __initdata boar
},
};
@ -117,7 +117,7 @@
static struct b53_platform_data WAP5813n_b53_pdata = {
.alias = "eth0",
};
@@ -4853,6 +4963,7 @@ static const struct board_info __initcon
@@ -4849,6 +4959,7 @@ static const struct board_info __initcon
&board_96368mvwg,
&board_96368mvngr,
&board_VR3025u,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4261,6 +4261,96 @@ static struct sprom_fixup __initdata vr3
@@ -4257,6 +4257,96 @@ static struct sprom_fixup __initdata vr3
{ .offset = 115, .value = 0xfad9 },
};
@ -97,7 +97,7 @@
static struct board_info __initdata board_VR3025u = {
.name = "96368M-1541N",
.expected_cpu_id = 0x6368,
@@ -4962,6 +5052,7 @@ static const struct board_info __initcon
@@ -4958,6 +5048,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6368
&board_96368mvwg,
&board_96368mvngr,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -3218,6 +3218,56 @@ static struct board_info __initdata boar
@@ -3214,6 +3214,56 @@ static struct board_info __initdata boar
.num_spis = ARRAY_SIZE(ct6373_spi_devices),
};
@ -57,7 +57,7 @@
static struct board_info __initdata board_HW553 = {
.name = "HW553",
.expected_cpu_id = 0x6358,
@@ -5035,6 +5085,7 @@ static const struct board_info __initcon
@@ -5031,6 +5081,7 @@ static const struct board_info __initcon
&board_nb4_ser_r0,
&board_nb4_fxc_r1,
&board_ct6373_1,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -611,6 +611,95 @@ static struct board_info __initdata boar
@@ -607,6 +607,95 @@ static struct board_info __initdata boar
},
};
@ -96,7 +96,7 @@
static struct board_info __initdata board_A4001N1 = {
.name = "963281T_TEF",
.expected_cpu_id = 0x6328,
@@ -5036,6 +5125,7 @@ static const struct board_info __initcon
@@ -5032,6 +5121,7 @@ static const struct board_info __initcon
&board_AR5381u,
&board_AR5387un,
&board_963281TAN,

View file

@ -1,6 +1,6 @@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -264,6 +264,141 @@ static struct board_info __initdata boar
@@ -260,6 +260,141 @@ static struct board_info __initdata boar
},
},
};
@ -142,7 +142,7 @@
#endif /* CONFIG_BCM63XX_CPU_6318 */
/*
@@ -5119,6 +5254,7 @@ static const struct board_info __initcon
@@ -5115,6 +5250,7 @@ static const struct board_info __initcon
#ifdef CONFIG_BCM63XX_CPU_6318
&board_96318ref,
&board_96318ref_p300,