kernel: update linux 3.3 to 3.3.5
SVN-Revision: 31645
This commit is contained in:
@@ -10,7 +10,7 @@ ARCH:=mips
|
||||
BOARD:=brcm63xx
|
||||
BOARDNAME:=Broadcom BCM63xx
|
||||
FEATURES:=squashfs jffs2 usb atm pci pcmcia
|
||||
LINUX_VERSION:=3.3.4
|
||||
LINUX_VERSION:=3.3.5
|
||||
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
@@ -66,7 +66,7 @@ Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device.
|
||||
#include <board_bcm963xx.h>
|
||||
#include <bcm_tag.h>
|
||||
|
||||
@@ -944,6 +945,9 @@ int __init board_register_devices(void)
|
||||
@@ -943,6 +944,9 @@ int __init board_register_devices(void)
|
||||
!board_get_mac_address(board.enet1.mac_addr))
|
||||
bcm63xx_enet_register(1, &board.enet1);
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device.
|
||||
#include <board_bcm963xx.h>
|
||||
#include <bcm_tag.h>
|
||||
|
||||
@@ -945,6 +946,9 @@ int __init board_register_devices(void)
|
||||
@@ -944,6 +945,9 @@ int __init board_register_devices(void)
|
||||
!board_get_mac_address(board.enet1.mac_addr))
|
||||
bcm63xx_enet_register(1, &board.enet1);
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -876,7 +876,7 @@ static struct mtd_partition mtd_partitio
|
||||
@@ -875,7 +875,7 @@ static struct mtd_partition mtd_partitio
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -848,6 +848,8 @@ void __init board_prom_init(void)
|
||||
@@ -847,6 +847,8 @@ void __init board_prom_init(void)
|
||||
if (BCMCPU_IS_6348())
|
||||
val |= GPIO_MODE_6348_G3_EXT_MII |
|
||||
GPIO_MODE_6348_G0_EXT_MII;
|
||||
|
||||
@@ -13,7 +13,7 @@ Subject: [PATCH 31/63] bcm63xx_enet: add support for bcm6368 internal ethernet s
|
||||
|
||||
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
||||
@@ -948,6 +948,10 @@ int __init board_register_devices(void)
|
||||
@@ -947,6 +947,10 @@ int __init board_register_devices(void)
|
||||
!board_get_mac_address(board.enet1.mac_addr))
|
||||
bcm63xx_enet_register(1, &board.enet1);
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@
|
||||
|
||||
/* dump cfe version */
|
||||
cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
|
||||
@@ -2161,6 +2235,13 @@ int __init board_register_devices(void)
|
||||
@@ -2160,6 +2234,13 @@ int __init board_register_devices(void)
|
||||
val = bcm_mpi_readl(MPI_CSBASE_REG(0));
|
||||
val &= MPI_CSBASE_BASE_MASK;
|
||||
|
||||
|
||||
@@ -102,8 +102,8 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
|
||||
};
|
||||
|
||||
static void __init nb4_nvram_fixup(void)
|
||||
@@ -2283,12 +2361,25 @@ void __init board_prom_init(void)
|
||||
bcm63xx_pci_enabled = 1;
|
||||
@@ -2282,12 +2360,25 @@ void __init board_prom_init(void)
|
||||
if (board.has_pci) {
|
||||
if (BCMCPU_IS_6348())
|
||||
val |= GPIO_MODE_6348_G2_PCI;
|
||||
+
|
||||
|
||||
Reference in New Issue
Block a user