qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-04-21 12:27:27 +03:00
Code Activity

kernel: update from kernel 2.6.32.16 to kernel 2.6.32.25 and refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23915 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
hauke
2010-11-07 15:59:49 +00:00
parent 9fc27c6cb4
commit 766ef77087
30 changed files with 72 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/brcm47xx/Makefile
View File

@@ -11,7 +11,7 @@ BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb pcmcia
LINUX_VERSION:=2.6.32.16
LINUX_VERSION:=2.6.32.25
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram

4
target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch
View File

@@ -345,7 +345,7 @@
}
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -733,6 +733,9 @@ static void __cpuinit build_r4000_tlb_re
@@ -738,6 +738,9 @@ static void __cpuinit build_r4000_tlb_re
/* No need for uasm_i_nop */
}
@@ -355,7 +355,7 @@
#ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else
@@ -1185,6 +1188,9 @@ build_r4000_tlbchange_handler_head(u32 *
@@ -1190,6 +1193,9 @@ build_r4000_tlbchange_handler_head(u32 *
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{

6
target/linux/brcm47xx/patches-2.6.32/220-bcm5354.patch
View File

@@ -1,6 +1,6 @@
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -260,6 +260,8 @@ void ssb_chipco_resume(struct ssb_chipco
@@ -261,6 +261,8 @@ void ssb_chipco_resume(struct ssb_chipco
void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@@ -9,7 +9,7 @@
*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
switch (*plltype) {
@@ -283,6 +285,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
@@ -284,6 +286,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@@ -31,7 +31,7 @@
}
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1073,6 +1073,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
@@ -1075,6 +1075,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
if (bus->chip_id == 0x5365) {
rate = 100000000;

2
target/linux/brcm47xx/patches-2.6.32/270-ehci-ssb.patch
View File

@@ -29,7 +29,7 @@
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1141,8 +1141,16 @@ MODULE_LICENSE ("GPL");
@@ -1142,8 +1142,16 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_atmel_driver
#endif

13
target/linux/brcm47xx/patches-2.6.32/275-usb2-bcm5354-init.patch
View File

@@ -41,19 +41,18 @@ Signed-off-by: Steve Brown <sbrown@cortland.com>
- ssb_write32(dev, 0x400, tmp);
- tmp = ssb_read32(dev, 0x400);
- printk("USB20H fcr: 0x%0x\n", tmp);
-
+ /* Work around for 5354 failures */
+ if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
+ /* Change syn01 reg */
+ tmp = 0x00fe00fe;
+ ssb_write32(dev, 0x894, tmp);
- /* Change Shim control reg */
- tmp = ssb_read32(dev, 0x304);
- tmp &= ~0x100;
- ssb_write32(dev, 0x304, tmp);
- tmp = ssb_read32(dev, 0x304);
- printk("USB20H shim: 0x%0x\n", tmp);
+ /* Work around for 5354 failures */
+ if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
+ /* Change syn01 reg */
+ tmp = 0x00fe00fe;
+ ssb_write32(dev, 0x894, tmp);
+
+ /* Change syn03 reg */
+ tmp = ssb_read32(dev, 0x89c);
+ tmp |= 0x1;

2
target/linux/brcm47xx/patches-2.6.32/280-activate_ssb_support_in_usb.patch
View File

@@ -5,7 +5,7 @@ This prevents the options from being delete with make kernel_oldconfig.
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -140,6 +140,8 @@ config SSB_DRIVER_MIPS
@@ -141,6 +141,8 @@ config SSB_DRIVER_MIPS
config SSB_EMBEDDED
bool
depends on SSB_DRIVER_MIPS

2
target/linux/brcm47xx/patches-2.6.32/610-pci_ide_fix.patch
View File

@@ -1,6 +1,6 @@
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -195,7 +195,11 @@
@@ -195,7 +195,11 @@ static inline void ide_std_init_ports(st
hw->io_ports.ctl_addr = ctl_addr;
}

26
target/linux/brcm47xx/patches-2.6.32/700-ssb-gigabit-ethernet-driver.patch
View File

@@ -8,7 +8,7 @@
#include <net/checksum.h>
#include <net/ip.h>
@@ -457,8 +458,9 @@ static void _tw32_flush(struct tg3 *tp,
@@ -457,8 +458,9 @@ static void _tw32_flush(struct tg3 *tp,
static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
{
tp->write32_mbox(tp, off, val);
@@ -52,7 +52,7 @@
{
u32 frame_val;
unsigned int loops;
@@ -866,6 +873,11 @@ static int tg3_writephy(struct tg3 *tp,
@@ -866,6 +873,11 @@ static int tg3_writephy(struct tg3 *tp,
return ret;
}
@@ -129,7 +129,7 @@
tw32(GRC_MODE, tp->grc_mode);
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
@@ -6704,9 +6742,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
@@ -6704,9 +6742,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
return -ENODEV;
}
@@ -157,7 +157,7 @@
fw_data = (void *)tp->fw->data;
/* Firmware blob starts with version numbers, followed by
@@ -6828,6 +6874,11 @@ static int tg3_load_tso_firmware(struct
@@ -6828,6 +6874,11 @@ static int tg3_load_tso_firmware(struct
unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
int err, i;
@@ -181,7 +181,7 @@
if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
/* All of this garbage is because when using non-tagged
* IRQ status the mailbox/status_block protocol the chip
@@ -9800,6 +9856,11 @@ static int tg3_test_nvram(struct tg3 *tp
@@ -9801,6 +9857,11 @@ static int tg3_test_nvram(struct tg3 *tp
if (tp->tg3_flags3 & TG3_FLG3_NO_NVRAM)
return 0;
@@ -193,7 +193,7 @@
if (tg3_nvram_read(tp, 0, &magic) != 0)
return -EIO;
@@ -10594,7 +10655,7 @@ static int tg3_ioctl(struct net_device *
@@ -10595,7 +10656,7 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
@@ -202,7 +202,7 @@
spin_unlock_bh(&tp->lock);
data->val_out = mii_regval;
@@ -10610,7 +10671,7 @@ static int tg3_ioctl(struct net_device *
@@ -10611,7 +10672,7 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
@@ -211,7 +211,7 @@
spin_unlock_bh(&tp->lock);
return err;
@@ -11255,6 +11316,12 @@ static void __devinit tg3_get_5717_nvram
@@ -11256,6 +11317,12 @@ static void __devinit tg3_get_5717_nvram
/* Chips other than 5700/5701 use the NVRAM for fetching info. */
static void __devinit tg3_nvram_init(struct tg3 *tp)
{
@@ -224,7 +224,7 @@
tw32_f(GRC_EEPROM_ADDR,
(EEPROM_ADDR_FSM_RESET |
(EEPROM_DEFAULT_CLOCK_PERIOD <<
@@ -11515,6 +11582,9 @@ static int tg3_nvram_write_block(struct
@@ -11516,6 +11583,9 @@ static int tg3_nvram_write_block(struct
{
int ret;
@@ -234,7 +234,7 @@
if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
~GRC_LCLCTRL_GPIO_OUTPUT1);
@@ -12800,6 +12870,11 @@ static int __devinit tg3_get_invariants(
@@ -12801,6 +12871,11 @@ static int __devinit tg3_get_invariants(
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
@@ -246,7 +246,7 @@
/* Get eeprom hw config before calling tg3_set_power_state().
* In particular, the TG3_FLG2_IS_NIC flag must be
* determined before calling tg3_set_power_state() so that
@@ -13189,6 +13264,10 @@ static int __devinit tg3_get_device_addr
@@ -13190,6 +13265,10 @@ static int __devinit tg3_get_device_addr
}
if (!is_valid_ether_addr(&dev->dev_addr[0])) {
@@ -257,7 +257,7 @@
#ifdef CONFIG_SPARC
if (!tg3_get_default_macaddr_sparc(tp))
return 0;
@@ -13681,6 +13760,7 @@ static char * __devinit tg3_phy_string(s
@@ -13682,6 +13761,7 @@ static char * __devinit tg3_phy_string(s
case PHY_ID_BCM5704: return "5704";
case PHY_ID_BCM5705: return "5705";
case PHY_ID_BCM5750: return "5750";
@@ -265,7 +265,7 @@
case PHY_ID_BCM5752: return "5752";
case PHY_ID_BCM5714: return "5714";
case PHY_ID_BCM5780: return "5780";
@@ -13892,6 +13972,13 @@ static int __devinit tg3_init_one(struct
@@ -13893,6 +13973,13 @@ static int __devinit tg3_init_one(struct
tp->msg_enable = tg3_debug;
else
tp->msg_enable = TG3_DEF_MSG_ENABLE;

2
target/linux/brcm47xx/patches-2.6.32/813-use_netdev_alloc_skb.patch
View File

@@ -1,6 +1,6 @@
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -850,7 +850,7 @@ static int b44_rx(struct b44 *bp, int bu
@@ -817,7 +817,7 @@ static int b44_rx(struct b44 *bp, int bu
struct sk_buff *copy_skb;
b44_recycle_rx(bp, cons, bp->rx_prod);

8
target/linux/brcm47xx/patches-2.6.32/920-cache-wround.patch
View File

@@ -41,7 +41,7 @@
UASM_i_LA_mostly(p, ptr, pgdc);
#endif
uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
@@ -733,12 +736,12 @@ static void __cpuinit build_r4000_tlb_re
@@ -738,12 +741,12 @@ static void __cpuinit build_r4000_tlb_re
/* No need for uasm_i_nop */
}
@@ -57,7 +57,7 @@
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
#endif
@@ -750,6 +753,9 @@ static void __cpuinit build_r4000_tlb_re
@@ -755,6 +758,9 @@ static void __cpuinit build_r4000_tlb_re
build_update_entries(&p, K0, K1);
build_tlb_write_entry(&p, &l, &r, tlb_random);
uasm_l_leave(&l, p);
@@ -67,7 +67,7 @@
uasm_i_eret(&p); /* return from trap */
#ifdef CONFIG_HUGETLB_PAGE
@@ -1188,12 +1194,12 @@ build_r4000_tlbchange_handler_head(u32 *
@@ -1193,12 +1199,12 @@ build_r4000_tlbchange_handler_head(u32 *
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{
@@ -83,7 +83,7 @@
build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
#endif
@@ -1230,6 +1236,9 @@ build_r4000_tlbchange_handler_tail(u32 *
@@ -1235,6 +1241,9 @@ build_r4000_tlbchange_handler_tail(u32 *
build_update_entries(p, tmp, ptr);
build_tlb_write_entry(p, l, r, tlb_indexed);
uasm_l_leave(l, *p);