From 219280afea62239fd9d6585960de6167d3facbb4 Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 23 May 2010 13:17:56 +0000 Subject: brcm47xx: refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21543 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../brcm47xx/patches-2.6.34/130-remove_scache.patch | 2 +- .../linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch | 4 ++-- .../linux/brcm47xx/patches-2.6.34/270-ehci-ssb.patch | 2 +- .../280-activate_ssb_support_in_usb.patch | 2 +- .../700-ssb-gigabit-ethernet-driver.patch | 18 +++++++++--------- .../brcm47xx/patches-2.6.34/920-cache-wround.patch | 10 +++++----- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'target/linux/brcm47xx/patches-2.6.34') diff --git a/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch index f667a2630..0bdb13d3f 100644 --- a/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch +++ b/target/linux/brcm47xx/patches-2.6.34/130-remove_scache.patch @@ -8,7 +8,7 @@ select PCI_GT64XXX_PCI0 select MIPS_MSC select SWAP_IO_SPACE -@@ -1560,13 +1559,6 @@ config IP22_CPU_SCACHE +@@ -1589,13 +1588,6 @@ config IP22_CPU_SCACHE bool select BOARD_SCACHE diff --git a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch index f9fb25e71..de79ca889 100644 --- a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch @@ -345,7 +345,7 @@ } --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -801,6 +801,9 @@ static void __cpuinit build_r4000_tlb_re +@@ -868,6 +868,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 -@@ -1260,6 +1263,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1318,6 +1321,9 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { diff --git a/target/linux/brcm47xx/patches-2.6.34/270-ehci-ssb.patch b/target/linux/brcm47xx/patches-2.6.34/270-ehci-ssb.patch index 0a68d0b3a..700d58b0f 100644 --- a/target/linux/brcm47xx/patches-2.6.34/270-ehci-ssb.patch +++ b/target/linux/brcm47xx/patches-2.6.34/270-ehci-ssb.patch @@ -29,7 +29,7 @@ depends on USB --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1158,8 +1158,16 @@ MODULE_LICENSE ("GPL"); +@@ -1159,8 +1159,16 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_atmel_driver #endif diff --git a/target/linux/brcm47xx/patches-2.6.34/280-activate_ssb_support_in_usb.patch b/target/linux/brcm47xx/patches-2.6.34/280-activate_ssb_support_in_usb.patch index f22415856..1a50c1a9d 100644 --- a/target/linux/brcm47xx/patches-2.6.34/280-activate_ssb_support_in_usb.patch +++ b/target/linux/brcm47xx/patches-2.6.34/280-activate_ssb_support_in_usb.patch @@ -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 diff --git a/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch index f2493dd25..384b925a0 100644 --- a/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.34/700-ssb-gigabit-ethernet-driver.patch @@ -199,7 +199,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 -@@ -10278,6 +10334,11 @@ static int tg3_test_nvram(struct tg3 *tp +@@ -10279,6 +10335,11 @@ static int tg3_test_nvram(struct tg3 *tp if (tp->tg3_flags3 & TG3_FLG3_NO_NVRAM) return 0; @@ -211,7 +211,7 @@ if (tg3_nvram_read(tp, 0, &magic) != 0) return -EIO; -@@ -11097,7 +11158,7 @@ static int tg3_ioctl(struct net_device * +@@ -11098,7 +11159,7 @@ static int tg3_ioctl(struct net_device * return -EAGAIN; spin_lock_bh(&tp->lock); @@ -220,7 +220,7 @@ spin_unlock_bh(&tp->lock); data->val_out = mii_regval; -@@ -11113,7 +11174,7 @@ static int tg3_ioctl(struct net_device * +@@ -11114,7 +11175,7 @@ static int tg3_ioctl(struct net_device * return -EAGAIN; spin_lock_bh(&tp->lock); @@ -229,7 +229,7 @@ spin_unlock_bh(&tp->lock); return err; -@@ -11758,6 +11819,12 @@ static void __devinit tg3_get_5717_nvram +@@ -11759,6 +11820,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) { @@ -242,7 +242,7 @@ tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -12019,6 +12086,9 @@ static int tg3_nvram_write_block(struct +@@ -12020,6 +12087,9 @@ static int tg3_nvram_write_block(struct { int ret; @@ -252,7 +252,7 @@ if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -13359,6 +13429,11 @@ static int __devinit tg3_get_invariants( +@@ -13360,6 +13430,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; @@ -264,7 +264,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 -@@ -13752,6 +13827,10 @@ static int __devinit tg3_get_device_addr +@@ -13753,6 +13828,10 @@ static int __devinit tg3_get_device_addr } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -275,7 +275,7 @@ #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -14271,6 +14350,7 @@ static char * __devinit tg3_phy_string(s +@@ -14272,6 +14351,7 @@ static char * __devinit tg3_phy_string(s case TG3_PHY_ID_BCM5704: return "5704"; case TG3_PHY_ID_BCM5705: return "5705"; case TG3_PHY_ID_BCM5750: return "5750"; @@ -283,7 +283,7 @@ case TG3_PHY_ID_BCM5752: return "5752"; case TG3_PHY_ID_BCM5714: return "5714"; case TG3_PHY_ID_BCM5780: return "5780"; -@@ -14480,6 +14560,13 @@ static int __devinit tg3_init_one(struct +@@ -14481,6 +14561,13 @@ static int __devinit tg3_init_one(struct tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; diff --git a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch index 6291a222d..b9b22256a 100644 --- a/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch +++ b/target/linux/brcm47xx/patches-2.6.34/920-cache-wround.patch @@ -31,7 +31,7 @@ --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -640,6 +640,9 @@ build_get_pgde32(u32 **p, unsigned int t +@@ -707,6 +707,9 @@ build_get_pgde32(u32 **p, unsigned int t #endif uasm_i_addu(p, ptr, tmp, ptr); #else @@ -41,7 +41,7 @@ UASM_i_LA_mostly(p, ptr, pgdc); #endif uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */ -@@ -801,12 +804,12 @@ static void __cpuinit build_r4000_tlb_re +@@ -868,12 +871,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 -@@ -818,6 +821,9 @@ static void __cpuinit build_r4000_tlb_re +@@ -885,6 +888,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 -@@ -1263,12 +1269,12 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1321,12 +1327,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 -@@ -1305,6 +1311,9 @@ build_r4000_tlbchange_handler_tail(u32 * +@@ -1363,6 +1369,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); -- cgit v1.2.3