From 55664ae04b97d1be20b1576bf2da0902113106fd Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 21 Feb 2011 02:06:51 +0000 Subject: kernel: remove imq support, refresh patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25641 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/patches-2.6.37/001-ar71xx_core.patch | 4 ++-- .../linux/ar71xx/patches-2.6.37/003-ar71xx_usb_host.patch | 2 +- .../ar71xx/patches-2.6.37/005-ar71xx_mac_driver.patch | 2 +- .../ar71xx/patches-2.6.37/006-ar71xx_wdt_driver.patch | 2 +- .../102-mtd_m25p80_add_myloader_parser.patch | 2 +- .../patches-2.6.37/104-mtd_m25p80_add_redboot_parser.patch | 2 +- .../patches-2.6.37/107-mtd-SST39VF6401B-support.patch | 4 ++-- .../108-mtd_fix_cfi_cmdset_0002_status_check.patch | 14 +++++++------- .../patches-2.6.37/109-mtd-wrt160nl-trx-parser.patch | 2 +- .../110-usb-ehci-add-war-for-synopsys-hc-bug.patch | 4 ++-- .../111-mtd-cfi_cmdset_0002-force-word-write.patch | 6 +++--- .../patches-2.6.37/205-wndr3700-usb-led-driver.patch | 6 +++--- .../linux/ar71xx/patches-2.6.37/207-rb750-led-driver.patch | 2 +- .../linux/ar71xx/patches-2.6.37/300-mips_fw_myloader.patch | 2 +- .../400-2.6.35-fix-nand_scan_ident-options.patch | 2 +- .../patches-2.6.37/901-get_c0_compare_irq_function.patch | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) (limited to 'target/linux/ar71xx/patches-2.6.37') diff --git a/target/linux/ar71xx/patches-2.6.37/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.37/001-ar71xx_core.patch index 4c0d395eb..0adb2189a 100644 --- a/target/linux/ar71xx/patches-2.6.37/001-ar71xx_core.patch +++ b/target/linux/ar71xx/patches-2.6.37/001-ar71xx_core.patch @@ -16,7 +16,7 @@ cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,) --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -63,6 +63,23 @@ config AR7 +@@ -65,6 +65,23 @@ config AR7 Support for the Texas Instruments AR7 System-on-a-Chip family: TNETD7100, 7200 and 7300. @@ -40,7 +40,7 @@ config BCM47XX bool "Broadcom BCM47XX based boards" select CEVT_R4K -@@ -715,6 +732,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD +@@ -717,6 +734,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD endchoice source "arch/mips/alchemy/Kconfig" diff --git a/target/linux/ar71xx/patches-2.6.37/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.37/003-ar71xx_usb_host.patch index 0551442b9..be2e5451d 100644 --- a/target/linux/ar71xx/patches-2.6.37/003-ar71xx_usb_host.patch +++ b/target/linux/ar71xx/patches-2.6.37/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 -@@ -1216,6 +1216,11 @@ MODULE_LICENSE ("GPL"); +@@ -1229,6 +1229,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_octeon_driver #endif diff --git a/target/linux/ar71xx/patches-2.6.37/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.37/005-ar71xx_mac_driver.patch index 566446377..909f2ed9c 100644 --- a/target/linux/ar71xx/patches-2.6.37/005-ar71xx_mac_driver.patch +++ b/target/linux/ar71xx/patches-2.6.37/005-ar71xx_mac_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig -@@ -2191,6 +2191,8 @@ config ACENIC_OMIT_TIGON_I +@@ -2068,6 +2068,8 @@ config ACENIC_OMIT_TIGON_I The safe and default value for this is N. diff --git a/target/linux/ar71xx/patches-2.6.37/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.37/006-ar71xx_wdt_driver.patch index ad5807e19..5f5c4986e 100644 --- a/target/linux/ar71xx/patches-2.6.37/006-ar71xx_wdt_driver.patch +++ b/target/linux/ar71xx/patches-2.6.37/006-ar71xx_wdt_driver.patch @@ -1,6 +1,6 @@ --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig -@@ -927,6 +927,13 @@ config BCM63XX_WDT +@@ -930,6 +930,13 @@ config BCM63XX_WDT To compile this driver as a loadable module, choose M here. The module will be called bcm63xx_wdt. diff --git a/target/linux/ar71xx/patches-2.6.37/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.37/102-mtd_m25p80_add_myloader_parser.patch index 17a3bc28b..dcf7a6def 100644 --- a/target/linux/ar71xx/patches-2.6.37/102-mtd_m25p80_add_myloader_parser.patch +++ b/target/linux/ar71xx/patches-2.6.37/102-mtd_m25p80_add_myloader_parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -937,6 +937,16 @@ static int __devinit m25p_probe(struct s +@@ -933,6 +933,16 @@ static int __devinit m25p_probe(struct s part_probes, &parts, 0); } diff --git a/target/linux/ar71xx/patches-2.6.37/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.37/104-mtd_m25p80_add_redboot_parser.patch index 2b10acbd0..bb0ff7d3f 100644 --- a/target/linux/ar71xx/patches-2.6.37/104-mtd_m25p80_add_redboot_parser.patch +++ b/target/linux/ar71xx/patches-2.6.37/104-mtd_m25p80_add_redboot_parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -947,6 +947,15 @@ static int __devinit m25p_probe(struct s +@@ -943,6 +943,15 @@ static int __devinit m25p_probe(struct s } #endif diff --git a/target/linux/ar71xx/patches-2.6.37/107-mtd-SST39VF6401B-support.patch b/target/linux/ar71xx/patches-2.6.37/107-mtd-SST39VF6401B-support.patch index 246abd5dc..0c3814c1f 100644 --- a/target/linux/ar71xx/patches-2.6.37/107-mtd-SST39VF6401B-support.patch +++ b/target/linux/ar71xx/patches-2.6.37/107-mtd-SST39VF6401B-support.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/chips/jedec_probe.c +++ b/drivers/mtd/chips/jedec_probe.c -@@ -148,6 +148,7 @@ +@@ -149,6 +149,7 @@ #define SST39LF160 0x2782 #define SST39VF1601 0x234b #define SST39VF3201 0x235b @@ -8,7 +8,7 @@ #define SST39WF1601 0x274b #define SST39WF1602 0x274a #define SST39LF512 0x00D4 -@@ -1568,6 +1569,18 @@ static const struct amd_flash_info jedec +@@ -1582,6 +1583,18 @@ static const struct amd_flash_info jedec ERASEINFO(0x10000,64), } }, { diff --git a/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch index dc1bada6b..e8e1ec002 100644 --- a/target/linux/ar71xx/patches-2.6.37/108-mtd_fix_cfi_cmdset_0002_status_check.patch +++ b/target/linux/ar71xx/patches-2.6.37/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 -@@ -1231,8 +1231,8 @@ static int __xipram do_write_oneword(str +@@ -1228,8 +1228,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); -@@ -1248,6 +1248,8 @@ static int __xipram do_write_oneword(str +@@ -1245,6 +1245,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; -@@ -1579,7 +1581,6 @@ static int cfi_amdstd_write_buffers(stru +@@ -1576,7 +1578,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. -@@ -1643,8 +1644,8 @@ static int __xipram do_erase_chip(struct +@@ -1640,8 +1641,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", -@@ -1664,6 +1665,7 @@ static int __xipram do_erase_chip(struct +@@ -1661,6 +1662,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); -@@ -1731,9 +1733,9 @@ static int __xipram do_erase_oneblock(st +@@ -1728,9 +1730,9 @@ static int __xipram do_erase_oneblock(st chip->erase_suspended = 0; } @@ -59,7 +59,7 @@ } if (time_after(jiffies, timeo)) { -@@ -1755,6 +1757,7 @@ static int __xipram do_erase_oneblock(st +@@ -1752,6 +1754,7 @@ static int __xipram do_erase_oneblock(st ret = -EIO; } diff --git a/target/linux/ar71xx/patches-2.6.37/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.37/109-mtd-wrt160nl-trx-parser.patch index 7cd961dcb..c8012f57d 100644 --- a/target/linux/ar71xx/patches-2.6.37/109-mtd-wrt160nl-trx-parser.patch +++ b/target/linux/ar71xx/patches-2.6.37/109-mtd-wrt160nl-trx-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -956,6 +956,16 @@ static int __devinit m25p_probe(struct s +@@ -952,6 +952,16 @@ static int __devinit m25p_probe(struct s part_probes, &parts, 0); } #endif diff --git a/target/linux/ar71xx/patches-2.6.37/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.37/110-usb-ehci-add-war-for-synopsys-hc-bug.patch index edd9e4e02..905206d7b 100644 --- a/target/linux/ar71xx/patches-2.6.37/110-usb-ehci-add-war-for-synopsys-hc-bug.patch +++ b/target/linux/ar71xx/patches-2.6.37/110-usb-ehci-add-war-for-synopsys-hc-bug.patch @@ -12,8 +12,8 @@ /* makes sure the async qh will become idle */ --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h -@@ -133,6 +133,7 @@ struct ehci_hcd { /* one per controlle - unsigned broken_periodic:1; +@@ -134,6 +134,7 @@ struct ehci_hcd { /* one per controlle + unsigned amd_l1_fix:1; unsigned fs_i_thresh:1; /* Intel iso scheduling */ unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/ + unsigned has_synopsys_hc_bug:1; /* Synopsys HC */ diff --git a/target/linux/ar71xx/patches-2.6.37/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.37/111-mtd-cfi_cmdset_0002-force-word-write.patch index 9dca6eabd..a972f8f51 100644 --- a/target/linux/ar71xx/patches-2.6.37/111-mtd-cfi_cmdset_0002-force-word-write.patch +++ b/target/linux/ar71xx/patches-2.6.37/111-mtd-cfi_cmdset_0002-force-word-write.patch @@ -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) -@@ -1391,6 +1395,7 @@ static int cfi_amdstd_write_words(struct +@@ -1388,6 +1392,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) -@@ -1501,7 +1506,6 @@ static int __xipram do_write_buffer(stru +@@ -1498,7 +1503,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) { -@@ -1580,6 +1584,7 @@ static int cfi_amdstd_write_buffers(stru +@@ -1577,6 +1581,7 @@ static int cfi_amdstd_write_buffers(stru return 0; } diff --git a/target/linux/ar71xx/patches-2.6.37/205-wndr3700-usb-led-driver.patch b/target/linux/ar71xx/patches-2.6.37/205-wndr3700-usb-led-driver.patch index cfbea70c5..9fb5ffa02 100644 --- a/target/linux/ar71xx/patches-2.6.37/205-wndr3700-usb-led-driver.patch +++ b/target/linux/ar71xx/patches-2.6.37/205-wndr3700-usb-led-driver.patch @@ -1,8 +1,8 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -347,6 +347,13 @@ config LEDS_TRIGGERS - - if LEDS_TRIGGERS +@@ -377,6 +377,13 @@ config LEDS_TRIGGERS + These triggers allow kernel events to drive the LEDs and can + be configured via sysfs. If unsure, say Y. +config LEDS_WNDR3700_USB + tristate "NETGEAR WNDR3700 USB LED driver" diff --git a/target/linux/ar71xx/patches-2.6.37/207-rb750-led-driver.patch b/target/linux/ar71xx/patches-2.6.37/207-rb750-led-driver.patch index 6614fb933..34ec66d28 100644 --- a/target/linux/ar71xx/patches-2.6.37/207-rb750-led-driver.patch +++ b/target/linux/ar71xx/patches-2.6.37/207-rb750-led-driver.patch @@ -1,6 +1,6 @@ --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig -@@ -354,6 +354,10 @@ config LEDS_WNDR3700_USB +@@ -384,6 +384,10 @@ config LEDS_WNDR3700_USB This option enables support for the USB LED found on the NETGEAR WNDR3700 board. diff --git a/target/linux/ar71xx/patches-2.6.37/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.37/300-mips_fw_myloader.patch index 26e24c069..aaefb7112 100644 --- a/target/linux/ar71xx/patches-2.6.37/300-mips_fw_myloader.patch +++ b/target/linux/ar71xx/patches-2.6.37/300-mips_fw_myloader.patch @@ -10,7 +10,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -907,6 +907,9 @@ config MIPS_NILE4 +@@ -909,6 +909,9 @@ config MIPS_NILE4 config MIPS_DISABLE_OBSOLETE_IDE bool diff --git a/target/linux/ar71xx/patches-2.6.37/400-2.6.35-fix-nand_scan_ident-options.patch b/target/linux/ar71xx/patches-2.6.37/400-2.6.35-fix-nand_scan_ident-options.patch index 696094fdd..0b36217b6 100644 --- a/target/linux/ar71xx/patches-2.6.37/400-2.6.35-fix-nand_scan_ident-options.patch +++ b/target/linux/ar71xx/patches-2.6.37/400-2.6.35-fix-nand_scan_ident-options.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/nand/rb4xx_nand.c +++ b/drivers/mtd/nand/rb4xx_nand.c -@@ -220,7 +220,7 @@ static int __init rb4xx_nand_probe(struc +@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc platform_set_drvdata(pdev, info); diff --git a/target/linux/ar71xx/patches-2.6.37/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.37/901-get_c0_compare_irq_function.patch index 895d3ce88..38d997ef6 100644 --- a/target/linux/ar71xx/patches-2.6.37/901-get_c0_compare_irq_function.patch +++ b/target/linux/ar71xx/patches-2.6.37/901-get_c0_compare_irq_function.patch @@ -8,7 +8,7 @@ extern void check_wait(void); extern asmlinkage void r4k_wait(void); -@@ -1552,6 +1553,8 @@ void __cpuinit per_cpu_trap_init(void) +@@ -1578,6 +1579,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; -- cgit v1.2.3