mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-24 21:42:04 +02:00
[brcm63xx] renumber board patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27012 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
46a821162a
commit
ba86e7162d
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -49,6 +49,13 @@ static unsigned int mac_addr_used;
|
||||
@@ -39,6 +39,13 @@ static unsigned int mac_addr_used;
|
||||
static struct board_info board;
|
||||
|
||||
/*
|
||||
@ -14,7 +14,7 @@
|
||||
* known 6338 boards
|
||||
*/
|
||||
#ifdef CONFIG_BCM63XX_CPU_6338
|
||||
@@ -1444,6 +1451,7 @@ void __init board_prom_init(void)
|
||||
@@ -840,6 +847,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
|
||||
@@ -1477,6 +1477,8 @@ void __init board_prom_init(void)
|
||||
@@ -911,6 +911,8 @@ void __init board_prom_init(void)
|
||||
if (BCMCPU_IS_6348())
|
||||
val |= GPIO_MODE_6348_G3_EXT_MII |
|
||||
GPIO_MODE_6348_G0_EXT_MII;
|
@ -200,7 +200,7 @@
|
||||
#define BCM_6358_OHCI0_IRQ (IRQ_INTERNAL_BASE + 5)
|
||||
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||||
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h
|
||||
@@ -769,4 +769,116 @@
|
||||
@@ -771,4 +771,116 @@
|
||||
#define DMIPSPLLCFG_N2_SHIFT 29
|
||||
#define DMIPSPLLCFG_N2_MASK (0x7 << DMIPSPLLCFG_N2_SHIFT)
|
||||
|
||||
@ -982,7 +982,7 @@
|
||||
obj-y += boards/
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -33,6 +33,7 @@
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <bcm63xx_dev_usb_ohci.h>
|
||||
#include <bcm63xx_dev_usb_ehci.h>
|
||||
#include <bcm63xx_dev_usb_udc.h>
|
||||
@ -990,7 +990,7 @@
|
||||
#include <board_bcm963xx.h>
|
||||
|
||||
#define PFX "board_bcm963xx: "
|
||||
@@ -1587,6 +1588,9 @@ int __init board_register_devices(void)
|
||||
@@ -1024,6 +1025,9 @@ int __init board_register_devices(void)
|
||||
if (board.num_spis)
|
||||
spi_register_board_info(board.spis, board.num_spis);
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -464,6 +464,49 @@ static struct board_info __initdata boar
|
||||
@@ -472,6 +472,49 @@ static struct board_info __initdata boar
|
||||
|
||||
.has_ohci0 = 1,
|
||||
};
|
||||
@ -50,7 +50,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -728,6 +771,7 @@ static const struct board_info __initdat
|
||||
@@ -736,6 +779,7 @@ static const struct board_info __initdat
|
||||
&board_DV201AMR,
|
||||
&board_96348gw_a,
|
||||
&board_rta1025w_16,
|
@ -10,7 +10,7 @@
|
||||
#include <asm/addrspace.h>
|
||||
#include <bcm63xx_board.h>
|
||||
#include <bcm63xx_cpu.h>
|
||||
@@ -34,6 +37,12 @@
|
||||
@@ -35,6 +38,12 @@
|
||||
|
||||
#define PFX "board_bcm963xx: "
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
static struct bcm963xx_nvram nvram;
|
||||
static unsigned int mac_addr_used;
|
||||
static struct board_info board;
|
||||
@@ -749,6 +758,502 @@ static struct board_info __initdata boar
|
||||
@@ -757,6 +766,502 @@ static struct board_info __initdata boar
|
||||
|
||||
.has_ohci0 = 1,
|
||||
};
|
||||
@ -526,7 +526,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -779,9 +1284,30 @@ static const struct board_info __initdat
|
||||
@@ -787,9 +1292,30 @@ static const struct board_info __initdat
|
||||
&board_96358vw2,
|
||||
&board_AGPFS0,
|
||||
&board_DWVS0,
|
||||
@ -557,7 +557,7 @@
|
||||
/*
|
||||
* Register a sane SPROMv2 to make the on-board
|
||||
* bcm4318 WLAN work
|
||||
@@ -899,6 +1425,9 @@ void __init board_prom_init(void)
|
||||
@@ -908,6 +1434,9 @@ void __init board_prom_init(void)
|
||||
return;
|
||||
}
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -135,6 +135,38 @@ static struct board_info __initdata boar
|
||||
@@ -142,6 +142,38 @@ static struct board_info __initdata boar
|
||||
},
|
||||
},
|
||||
};
|
||||
@ -39,7 +39,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -1264,6 +1296,7 @@ static const struct board_info __initdat
|
||||
@@ -1271,6 +1303,7 @@ static const struct board_info __initdat
|
||||
#ifdef CONFIG_BCM63XX_CPU_6338
|
||||
&board_96338gw,
|
||||
&board_96338w,
|
||||
|
@ -63,11 +63,11 @@
|
||||
static struct board_info __initdata board_96348gw = {
|
||||
.name = "96348GW",
|
||||
.expected_cpu_id = 0x6348,
|
||||
@@ -1933,6 +1989,7 @@ static const struct board_info __initdat
|
||||
@@ -2009,6 +2065,7 @@ static const struct board_info __initdat
|
||||
&board_96348_D4PW,
|
||||
&board_spw500v,
|
||||
&board_ct536_ct5621,
|
||||
+ &board_V2110,
|
||||
&board_96348sv,
|
||||
&board_V2500V_BB,
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2071,6 +2071,17 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
@@ -2128,6 +2128,17 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
.boardflags_lo = 0x2848,
|
||||
.boardflags_hi = 0x0000,
|
||||
};
|
||||
@ -18,7 +18,7 @@
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -2271,8 +2282,9 @@ void __init board_prom_init(void)
|
||||
@@ -2328,8 +2339,9 @@ void __init board_prom_init(void)
|
||||
if (!board_get_mac_address(bcm63xx_sprom.il0mac)) {
|
||||
memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
|
||||
|
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -2051,7 +2051,7 @@ static void __init nb4_nvram_fixup(void)
|
||||
@@ -2108,7 +2108,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,
|
||||
@@ -2071,6 +2071,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
@@ -2128,6 +2128,7 @@ static struct ssb_sprom bcm63xx_sprom =
|
||||
.boardflags_lo = 0x2848,
|
||||
.boardflags_hi = 0x0000,
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user