diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2010-08-25 19:57:11 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2010-08-25 19:57:11 +0000 |
commit | e20b541885bfe2c3f7b202cb856f0d85df7bba5a (patch) | |
tree | b846da9664c9e42358c5397eee0bd1c30c07f78a /target/linux/ar71xx/patches-2.6.34 | |
parent | ab4d50054b704a56c10c23ff92f96960ffa75d55 (diff) | |
download | master-187ad058-e20b541885bfe2c3f7b202cb856f0d85df7bba5a.tar.gz master-187ad058-e20b541885bfe2c3f7b202cb856f0d85df7bba5a.tar.bz2 master-187ad058-e20b541885bfe2c3f7b202cb856f0d85df7bba5a.zip |
ar71xx: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22803 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.34')
8 files changed, 23 insertions, 23 deletions
diff --git a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch index 33be31383e..660dc77b8a 100644 --- a/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.34/001-ar71xx_core.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -168,6 +168,13 @@ ifeq (,$(findstring march=octeon, $(cfla +@@ -181,6 +181,13 @@ ifeq (,$(findstring march=octeon, $(cfla cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon endif @@ -38,9 +38,9 @@ + Support for Atheros AR71xx based boards. + config BCM47XX - bool "BCM47XX based boards" + bool "Broadcom BCM47XX based boards" select CEVT_R4K -@@ -682,6 +699,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD +@@ -684,6 +701,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD endchoice source "arch/mips/alchemy/Kconfig" diff --git a/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch index 2d7ffa014c..03309c2673 100644 --- a/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch +++ b/target/linux/ar71xx/patches-2.6.34/003-ar71xx_usb_host.patch @@ -30,7 +30,7 @@ depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx) --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL"); +@@ -1159,6 +1159,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_atmel_driver #endif diff --git a/target/linux/ar71xx/patches-2.6.34/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.34/101-ksz8041_phy_driver.patch index 5036046108..64418c9830 100644 --- a/target/linux/ar71xx/patches-2.6.34/101-ksz8041_phy_driver.patch +++ b/target/linux/ar71xx/patches-2.6.34/101-ksz8041_phy_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig -@@ -114,6 +114,11 @@ config RTL8306_PHY +@@ -119,6 +119,11 @@ config RTL8306_PHY tristate "Driver for Realtek RTL8306S switches" select SWCONFIG diff --git a/target/linux/ar71xx/patches-2.6.34/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.34/108-mtd_fix_cfi_cmdset_0002_status_check.patch index e0676cae93..4565611057 100644 --- a/target/linux/ar71xx/patches-2.6.34/108-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-2.6.34/108-mtd_fix_cfi_cmdset_0002_status_check.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -1130,8 +1130,8 @@ static int __xipram do_write_oneword(str +@@ -1158,8 +1158,8 @@ static int __xipram do_write_oneword(str break; } @@ -11,7 +11,7 @@ /* Latency issues. Drop the lock, wait a while and retry */ UDELAY(map, chip, adr, 1); -@@ -1147,6 +1147,8 @@ static int __xipram do_write_oneword(str +@@ -1175,6 +1175,8 @@ static int __xipram do_write_oneword(str ret = -EIO; } @@ -20,7 +20,7 @@ xip_enable(map, chip, adr); op_done: chip->state = FL_READY; -@@ -1493,7 +1495,6 @@ static int cfi_amdstd_write_buffers(stru +@@ -1521,7 +1523,6 @@ static int cfi_amdstd_write_buffers(stru return 0; } @@ -28,7 +28,7 @@ /* * Handle devices with one erase region, that only implement * the chip erase command. -@@ -1557,8 +1558,8 @@ static int __xipram do_erase_chip(struct +@@ -1585,8 +1586,8 @@ static int __xipram do_erase_chip(struct chip->erase_suspended = 0; } @@ -39,7 +39,7 @@ if (time_after(jiffies, timeo)) { printk(KERN_WARNING "MTD %s(): software timeout\n", -@@ -1578,6 +1579,7 @@ static int __xipram do_erase_chip(struct +@@ -1606,6 +1607,7 @@ static int __xipram do_erase_chip(struct ret = -EIO; } @@ -47,7 +47,7 @@ chip->state = FL_READY; xip_enable(map, chip, adr); put_chip(map, chip, adr); -@@ -1645,9 +1647,9 @@ static int __xipram do_erase_oneblock(st +@@ -1673,9 +1675,9 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -59,7 +59,7 @@ } if (time_after(jiffies, timeo)) { -@@ -1669,6 +1671,7 @@ static int __xipram do_erase_oneblock(st +@@ -1697,6 +1699,7 @@ static int __xipram do_erase_oneblock(st ret = -EIO; } diff --git a/target/linux/ar71xx/patches-2.6.34/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.34/110-usb-ehci-add-war-for-synopsys-hc-bug.patch index 076c39ea2b..98698547ba 100644 --- a/target/linux/ar71xx/patches-2.6.34/110-usb-ehci-add-war-for-synopsys-hc-bug.patch +++ b/target/linux/ar71xx/patches-2.6.34/110-usb-ehci-add-war-for-synopsys-hc-bug.patch @@ -12,10 +12,10 @@ /* makes sure the async qh will become idle */ --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h -@@ -129,6 +129,7 @@ struct ehci_hcd { /* one per controlle - unsigned has_amcc_usb23:1; +@@ -131,6 +131,7 @@ struct ehci_hcd { /* one per controlle unsigned need_io_watchdog:1; unsigned broken_periodic:1; + unsigned fs_i_thresh:1; /* Intel iso scheduling */ + unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ /* required for usb32 quirk */ diff --git a/target/linux/ar71xx/patches-2.6.34/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.34/111-mtd-cfi_cmdset_0002-force-word-write.patch index 3215a7d9d3..d9e2ccde25 100644 --- a/target/linux/ar71xx/patches-2.6.34/111-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-2.6.34/111-mtd-cfi_cmdset_0002-force-word-write.patch @@ -9,7 +9,7 @@ #define MAX_WORD_RETRIES 3 -@@ -55,7 +55,9 @@ +@@ -54,7 +54,9 @@ static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); @@ -19,7 +19,7 @@ static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *); static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *); static void cfi_amdstd_sync (struct mtd_info *); -@@ -190,6 +192,7 @@ static void fixup_amd_bootblock(struct m +@@ -189,6 +191,7 @@ static void fixup_amd_bootblock(struct m } #endif @@ -27,7 +27,7 @@ static void fixup_use_write_buffers(struct mtd_info *mtd, void *param) { struct map_info *map = mtd->priv; -@@ -199,6 +202,7 @@ static void fixup_use_write_buffers(stru +@@ -198,6 +201,7 @@ static void fixup_use_write_buffers(stru mtd->write = cfi_amdstd_write_buffers; } } @@ -35,7 +35,7 @@ /* Atmel chips don't use the same PRI format as AMD chips */ static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param) -@@ -1304,6 +1308,7 @@ static int cfi_amdstd_write_words(struct +@@ -1332,6 +1336,7 @@ static int cfi_amdstd_write_words(struct /* * FIXME: interleaved mode not tested, and probably not supported! */ @@ -43,7 +43,7 @@ static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, unsigned long adr, const u_char *buf, int len) -@@ -1415,7 +1420,6 @@ static int __xipram do_write_buffer(stru +@@ -1443,7 +1448,6 @@ static int __xipram do_write_buffer(stru return ret; } @@ -51,7 +51,7 @@ static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf) { -@@ -1494,6 +1498,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -1522,6 +1526,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } diff --git a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch index 48d0de83aa..a9e9669714 100644 --- a/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.34/300-mips_fw_myloader.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -190,6 +190,7 @@ endif +@@ -203,6 +203,7 @@ endif # libs-$(CONFIG_ARC) += arch/mips/fw/arc/ libs-$(CONFIG_CFE) += arch/mips/fw/cfe/ @@ -10,7 +10,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -877,6 +877,9 @@ config MIPS_NILE4 +@@ -879,6 +879,9 @@ config MIPS_NILE4 config MIPS_DISABLE_OBSOLETE_IDE bool diff --git a/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch index 595a40b2a9..6618a5d4c4 100644 --- a/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch +++ b/target/linux/ar71xx/patches-2.6.34/901-get_c0_compare_irq_function.patch @@ -8,7 +8,7 @@ extern void check_wait(void); extern asmlinkage void r4k_wait(void); -@@ -1501,6 +1502,8 @@ void __cpuinit per_cpu_trap_init(void) +@@ -1506,6 +1507,8 @@ void __cpuinit per_cpu_trap_init(void) if (cpu_has_mips_r2) { cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7; |