aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-2.6.39
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-02-10 08:19:28 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-02-10 08:19:28 +0000
commit86ef5faaeee5be867272cf82644dcc8849fd9c1c (patch)
tree9fa915c01ebe7ece81966aff6f38e0bbca5c4461 /target/linux/ar71xx/patches-2.6.39
parent5542aa3fa305df19fefa891f6188ad5a678cdcbb (diff)
downloadmaster-187ad058-86ef5faaeee5be867272cf82644dcc8849fd9c1c.tar.gz
master-187ad058-86ef5faaeee5be867272cf82644dcc8849fd9c1c.tar.bz2
master-187ad058-86ef5faaeee5be867272cf82644dcc8849fd9c1c.zip
ar71xx: nuke 2.6.39 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30404 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/patches-2.6.39')
-rw-r--r--target/linux/ar71xx/patches-2.6.39/001-ar71xx_core.patch50
-rw-r--r--target/linux/ar71xx/patches-2.6.39/002-ar71xx_pci.patch10
-rw-r--r--target/linux/ar71xx/patches-2.6.39/003-ar71xx_usb_host.patch58
-rw-r--r--target/linux/ar71xx/patches-2.6.39/004-ar71xx_spi_controller.patch26
-rw-r--r--target/linux/ar71xx/patches-2.6.39/005-ar71xx_mac_driver.patch21
-rw-r--r--target/linux/ar71xx/patches-2.6.39/006-ar71xx_wdt_driver.patch26
-rw-r--r--target/linux/ar71xx/patches-2.6.39/007-ar91xx_flash_driver.patch26
-rw-r--r--target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch23
-rw-r--r--target/linux/ar71xx/patches-2.6.39/101-ksz8041_phy_driver.patch24
-rw-r--r--target/linux/ar71xx/patches-2.6.39/107-mtd-SST39VF6401B-support.patch29
-rw-r--r--target/linux/ar71xx/patches-2.6.39/108-mtd_fix_cfi_cmdset_0002_status_check.patch69
-rw-r--r--target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch25
-rw-r--r--target/linux/ar71xx/patches-2.6.39/110-usb-ehci-add-war-for-synopsys-hc-bug.patch22
-rw-r--r--target/linux/ar71xx/patches-2.6.39/111-mtd-cfi_cmdset_0002-force-word-write.patch61
-rw-r--r--target/linux/ar71xx/patches-2.6.39/112-mtd-tp-link-partition-parser.patch25
-rw-r--r--target/linux/ar71xx/patches-2.6.39/113-mtd-m25p80-allow-to-specify-max-read-size.patch112
-rw-r--r--target/linux/ar71xx/patches-2.6.39/120-dsa-trailer-tag-validation-fix.patch11
-rw-r--r--target/linux/ar71xx/patches-2.6.39/121-dsa-add-88e6063-driver.patch26
-rw-r--r--target/linux/ar71xx/patches-2.6.39/140-redboot_partition_scan.patch54
-rw-r--r--target/linux/ar71xx/patches-2.6.39/150-drivers-link-spi-before-mtd.patch12
-rw-r--r--target/linux/ar71xx/patches-2.6.39/151-spi-add-various-flags.patch19
-rw-r--r--target/linux/ar71xx/patches-2.6.39/152-rb4xx-spi-driver.patch25
-rw-r--r--target/linux/ar71xx/patches-2.6.39/153-spi-rb4xx-cpld-driver.patch26
-rw-r--r--target/linux/ar71xx/patches-2.6.39/200-rb4xx_nand_driver.patch21
-rw-r--r--target/linux/ar71xx/patches-2.6.39/201-ap83_spi_controller.patch27
-rw-r--r--target/linux/ar71xx/patches-2.6.39/202-spi_vsc7385_driver.patch24
-rw-r--r--target/linux/ar71xx/patches-2.6.39/203-pb44_spi_controller.patch27
-rw-r--r--target/linux/ar71xx/patches-2.6.39/205-wndr3700-usb-led-driver.patch26
-rw-r--r--target/linux/ar71xx/patches-2.6.39/206-nxp-74hc153-gpio-chip-driver.patch26
-rw-r--r--target/linux/ar71xx/patches-2.6.39/207-rb750-led-driver.patch23
-rw-r--r--target/linux/ar71xx/patches-2.6.39/208-rb750-nand-driver.patch21
-rw-r--r--target/linux/ar71xx/patches-2.6.39/300-mips_fw_myloader.patch22
-rw-r--r--target/linux/ar71xx/patches-2.6.39/400-mips-disable-ath79-platform.patch11
-rw-r--r--target/linux/ar71xx/patches-2.6.39/500-ar933x-uart-driver.patch50
-rw-r--r--target/linux/ar71xx/patches-2.6.39/901-get_c0_compare_irq_function.patch29
-rw-r--r--target/linux/ar71xx/patches-2.6.39/902-fix-occasional-kernel-hangs-during-boot.patch104
-rw-r--r--target/linux/ar71xx/patches-2.6.39/910-unaligned_access_hacks.patch117
-rw-r--r--target/linux/ar71xx/patches-2.6.39/920-mdio_bitbang_ignore_ta_value.patch20
38 files changed, 0 insertions, 1328 deletions
diff --git a/target/linux/ar71xx/patches-2.6.39/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.39/001-ar71xx_core.patch
deleted file mode 100644
index c8ccfedfcb..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/001-ar71xx_core.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -158,6 +158,13 @@ cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -W
- endif
- cflags-$(CONFIG_CAVIUM_CN63XXP1) += -Wa,-mfix-cn63xxp1
-
-+#
-+# Atheros AR71xx
-+#
-+core-$(CONFIG_ATHEROS_AR71XX) += arch/mips/ar71xx/
-+cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx
-+load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000
-+
- cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
- cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
- cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -84,6 +84,23 @@ config ATH79
- help
- Support for the Atheros AR71XX/AR724X/AR913X SoCs.
-
-+config ATHEROS_AR71XX
-+ bool "Atheros AR71xx based boards"
-+ select CEVT_R4K
-+ select CSRC_R4K
-+ select DMA_NONCOHERENT
-+ select HW_HAS_PCI
-+ select IRQ_CPU
-+ select ARCH_REQUIRE_GPIOLIB
-+ select SYS_HAS_CPU_MIPS32_R1
-+ select SYS_HAS_CPU_MIPS32_R2
-+ select SYS_SUPPORTS_32BIT_KERNEL
-+ select SYS_SUPPORTS_BIG_ENDIAN
-+ select SYS_HAS_EARLY_PRINTK
-+ select MIPS_MACHINE
-+ help
-+ Support for Atheros AR71xx based boards.
-+
- config BCM47XX
- bool "Broadcom BCM47XX based boards"
- select CEVT_R4K
-@@ -739,6 +756,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
- endchoice
-
- source "arch/mips/alchemy/Kconfig"
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/ath79/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
diff --git a/target/linux/ar71xx/patches-2.6.39/002-ar71xx_pci.patch b/target/linux/ar71xx/patches-2.6.39/002-ar71xx_pci.patch
deleted file mode 100644
index 3facce9d70..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/002-ar71xx_pci.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/arch/mips/pci/Makefile
-+++ b/arch/mips/pci/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o
- obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o
- obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \
- ops-bcm63xx.o
-+obj-$(CONFIG_ATHEROS_AR71XX) += pci-ar71xx.o pci-ar724x.o
-
- #
- # These are still pretty much in the old state, watch, go blind.
diff --git a/target/linux/ar71xx/patches-2.6.39/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.39/003-ar71xx_usb_host.patch
deleted file mode 100644
index dd79451a67..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/003-ar71xx_usb_host.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- a/drivers/usb/host/Kconfig
-+++ b/drivers/usb/host/Kconfig
-@@ -129,6 +129,13 @@ config XPS_USB_HCD_XILINX
- config USB_FSL_MPH_DR_OF
- tristate
-
-+config USB_EHCI_AR71XX
-+ bool "USB EHCI support for AR71xx"
-+ depends on USB_EHCI_HCD && ATHEROS_AR71XX
-+ default y
-+ help
-+ Support for Atheros AR71xx built-in EHCI controller
-+
- config USB_EHCI_FSL
- bool "Support for Freescale on-chip EHCI USB controller"
- depends on USB_EHCI_HCD && FSL_SOC
-@@ -287,6 +294,13 @@ config USB_OHCI_HCD_OMAP3
- Enables support for the on-chip OHCI controller on
- OMAP3 and later chips.
-
-+config USB_OHCI_AR71XX
-+ bool "USB OHCI support for Atheros AR71xx"
-+ depends on USB_OHCI_HCD && ATHEROS_AR71XX
-+ default y
-+ help
-+ Support for Atheros AR71xx built-in OHCI controller
-+
- config USB_OHCI_HCD_PPC_SOC
- bool "OHCI support for on-chip PPC USB controller"
- depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
---- a/drivers/usb/host/ehci-hcd.c
-+++ b/drivers/usb/host/ehci-hcd.c
-@@ -1267,6 +1267,11 @@ MODULE_LICENSE ("GPL");
- #define PLATFORM_DRIVER tegra_ehci_driver
- #endif
-
-+#ifdef CONFIG_USB_EHCI_AR71XX
-+#include "ehci-ar71xx.c"
-+#define PLATFORM_DRIVER ehci_ar71xx_driver
-+#endif
-+
- #if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
- !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
- !defined(XILINX_OF_PLATFORM_DRIVER)
---- a/drivers/usb/host/ohci-hcd.c
-+++ b/drivers/usb/host/ohci-hcd.c
-@@ -1107,6 +1107,11 @@ MODULE_LICENSE ("GPL");
- #define PLATFORM_DRIVER ohci_hcd_cns3xxx_driver
- #endif
-
-+#ifdef CONFIG_USB_OHCI_AR71XX
-+#include "ohci-ar71xx.c"
-+#define PLATFORM_DRIVER ohci_hcd_ar71xx_driver
-+#endif
-+
- #if !defined(PCI_DRIVER) && \
- !defined(PLATFORM_DRIVER) && \
- !defined(OMAP1_PLATFORM_DRIVER) && \
diff --git a/target/linux/ar71xx/patches-2.6.39/004-ar71xx_spi_controller.patch b/target/linux/ar71xx/patches-2.6.39/004-ar71xx_spi_controller.patch
deleted file mode 100644
index d788016cc2..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/004-ar71xx_spi_controller.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -67,6 +67,13 @@ config SPI_ATH79
- This enables support for the SPI controller present on the
- Atheros AR71XX/AR724X/AR913X SoCs.
-
-+config SPI_AR71XX
-+ tristate "Atheros AR71xx SPI Controller"
-+ depends on SPI_MASTER && ATHEROS_AR71XX
-+ select SPI_BITBANG
-+ help
-+ This is the SPI contoller driver for Atheros AR71xx.
-+
- config SPI_ATMEL
- tristate "Atmel SPI Controller"
- depends on (ARCH_AT91 || AVR32)
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_SPI_MASTER) += spi.o
-
- # SPI master controller drivers (bus)
- obj-$(CONFIG_SPI_ALTERA) += spi_altera.o
-+obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o
- obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
- obj-$(CONFIG_SPI_ATH79) += ath79_spi.o
- obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
diff --git a/target/linux/ar71xx/patches-2.6.39/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.39/005-ar71xx_mac_driver.patch
deleted file mode 100644
index e1a8dff169..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/005-ar71xx_mac_driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/net/Kconfig
-+++ b/drivers/net/Kconfig
-@@ -2071,6 +2071,8 @@ config ACENIC_OMIT_TIGON_I
-
- The safe and default value for this is N.
-
-+source drivers/net/ag71xx/Kconfig
-+
- config DL2K
- tristate "DL2000/TC902x-based Gigabit Ethernet support"
- depends on PCI
---- a/drivers/net/Makefile
-+++ b/drivers/net/Makefile
-@@ -112,6 +112,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
- # end link order section
- #
-
-+obj-$(CONFIG_AG71XX) += ag71xx/
- obj-$(CONFIG_SUNDANCE) += sundance.o
- obj-$(CONFIG_HAMACHI) += hamachi.o
- obj-$(CONFIG_NET) += Space.o loopback.o
diff --git a/target/linux/ar71xx/patches-2.6.39/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.39/006-ar71xx_wdt_driver.patch
deleted file mode 100644
index 9a0d07d4e6..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/006-ar71xx_wdt_driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/watchdog/Kconfig
-+++ b/drivers/watchdog/Kconfig
-@@ -990,6 +990,13 @@ config BCM63XX_WDT
- To compile this driver as a loadable module, choose M here.
- The module will be called bcm63xx_wdt.
-
-+config AR71XX_WDT
-+ tristate "Atheros AR71xx Watchdog Timer"
-+ depends on ATHEROS_AR71XX
-+ help
-+ Hardware driver for the built-in watchdog timer on the Atheros
-+ AR71xx SoCs.
-+
- # PARISC Architecture
-
- # POWERPC Architecture
---- a/drivers/watchdog/Makefile
-+++ b/drivers/watchdog/Makefile
-@@ -119,6 +119,7 @@ obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o
- obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
- obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
- obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
-+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
- obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
- obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
- obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
diff --git a/target/linux/ar71xx/patches-2.6.39/007-ar91xx_flash_driver.patch b/target/linux/ar71xx/patches-2.6.39/007-ar91xx_flash_driver.patch
deleted file mode 100644
index b3e0dc4081..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/007-ar91xx_flash_driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/mtd/maps/Kconfig
-+++ b/drivers/mtd/maps/Kconfig
-@@ -260,6 +260,13 @@ config MTD_BCM963XX
- Support for parsing CFE image tag and creating MTD partitions on
- Broadcom BCM63xx boards.
-
-+config MTD_AR91XX_FLASH
-+ tristate "Atheros AR91xx parallel flash support"
-+ depends on ATHEROS_AR71XX
-+ select MTD_COMPLEX_MAPPINGS
-+ help
-+ Parallel flash driver for the Atheros AR91xx based boards.
-+
- config MTD_DILNETPC
- tristate "CFI Flash device mapped on DIL/Net PC"
- depends on X86 && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
---- a/drivers/mtd/maps/Makefile
-+++ b/drivers/mtd/maps/Makefile
-@@ -40,6 +40,7 @@ obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx2
- obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.o
- obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
- obj-$(CONFIG_MTD_PCI) += pci.o
-+obj-$(CONFIG_MTD_AR91XX_FLASH) += ar91xx_flash.o
- obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
- obj-$(CONFIG_MTD_EDB7312) += edb7312.o
- obj-$(CONFIG_MTD_IMPA7) += impa7.o
diff --git a/target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
deleted file mode 100644
index a41449277f..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/100-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -974,6 +974,10 @@ static int __devinit m25p_probe(struct s
- part_probes, &parts, 0);
- }
-
-+ if (nr_parts <= 0 && data && data->part_probes)
-+ nr_parts = parse_mtd_partitions(&flash->mtd,
-+ data->part_probes, &parts, 0);
-+
- if (nr_parts <= 0 && data && data->parts) {
- parts = data->parts;
- nr_parts = data->nr_parts;
---- a/include/linux/spi/flash.h
-+++ b/include/linux/spi/flash.h
-@@ -24,6 +24,7 @@ struct flash_platform_data {
- unsigned int nr_parts;
-
- char *type;
-+ const char **part_probes;
-
- /* we'll likely add more ... use JEDEC IDs, etc */
- };
diff --git a/target/linux/ar71xx/patches-2.6.39/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.39/101-ksz8041_phy_driver.patch
deleted file mode 100644
index 10905034f7..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/101-ksz8041_phy_driver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/net/phy/Kconfig
-+++ b/drivers/net/phy/Kconfig
-@@ -123,6 +123,11 @@ config RTL8306_PHY
- tristate "Driver for Realtek RTL8306S switches"
- select SWCONFIG
-
-+config MICREL_PHY
-+ tristate "Drivers for Micrel/Kendin PHYs"
-+ ---help---
-+ Currently has a driver for the KSZ8041
-+
- config FIXED_PHY
- bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
- depends on PHYLIB=y
---- a/drivers/net/phy/Makefile
-+++ b/drivers/net/phy/Makefile
-@@ -25,6 +25,7 @@ obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
- obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
- obj-$(CONFIG_RTL8367_PHY) += rtl8367.o
- obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
-+obj-$(CONFIG_MICREL_PHY) += micrel.o
- obj-$(CONFIG_FIXED_PHY) += fixed.o
- obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
- obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o
diff --git a/target/linux/ar71xx/patches-2.6.39/107-mtd-SST39VF6401B-support.patch b/target/linux/ar71xx/patches-2.6.39/107-mtd-SST39VF6401B-support.patch
deleted file mode 100644
index 246abd5dc0..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/107-mtd-SST39VF6401B-support.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/drivers/mtd/chips/jedec_probe.c
-+++ b/drivers/mtd/chips/jedec_probe.c
-@@ -148,6 +148,7 @@
- #define SST39LF160 0x2782
- #define SST39VF1601 0x234b
- #define SST39VF3201 0x235b
-+#define SST39VF6401B 0x236d
- #define SST39WF1601 0x274b
- #define SST39WF1602 0x274a
- #define SST39LF512 0x00D4
-@@ -1568,6 +1569,18 @@ static const struct amd_flash_info jedec
- ERASEINFO(0x10000,64),
- }
- }, {
-+ .mfr_id = CFI_MFR_SST,
-+ .dev_id = SST39VF6401B,
-+ .name = "SST 39VF6401B",
-+ .devtypes = CFI_DEVICETYPE_X16,
-+ .uaddr = MTD_UADDR_0xAAAA_0x5555,
-+ .dev_size = SIZE_8MiB,
-+ .cmd_set = P_ID_AMD_STD,
-+ .nr_regions = 1,
-+ .regions = {
-+ ERASEINFO(0x10000,128)
-+ }
-+ }, {
- .mfr_id = CFI_MFR_ST,
- .dev_id = M29F800AB,
- .name = "ST M29F800AB",
diff --git a/target/linux/ar71xx/patches-2.6.39/108-mtd_fix_cfi_cmdset_0002_status_check.patch b/target/linux/ar71xx/patches-2.6.39/108-mtd_fix_cfi_cmdset_0002_status_check.patch
deleted file mode 100644
index 226f3b0914..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/108-mtd_fix_cfi_cmdset_0002_status_check.patch
+++ /dev/null
@@ -1,69 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1219,8 +1219,8 @@ static int __xipram do_write_oneword(str
- break;
- }
-
-- if (chip_ready(map, adr))
-- break;
-+ if (chip_good(map, adr, datum))
-+ goto enable_xip;
-
- /* Latency issues. Drop the lock, wait a while and retry */
- UDELAY(map, chip, adr, 1);
-@@ -1236,6 +1236,8 @@ static int __xipram do_write_oneword(str
-
- ret = -EIO;
- }
-+
-+ enable_xip:
- xip_enable(map, chip, adr);
- op_done:
- chip->state = FL_READY;
-@@ -1567,7 +1569,6 @@ static int cfi_amdstd_write_buffers(stru
- return 0;
- }
-
--
- /*
- * Handle devices with one erase region, that only implement
- * the chip erase command.
-@@ -1631,8 +1632,8 @@ static int __xipram do_erase_chip(struct
- chip->erase_suspended = 0;
- }
-
-- if (chip_ready(map, adr))
-- break;
-+ if (chip_good(map, adr, map_word_ff(map)))
-+ goto op_done;
-
- if (time_after(jiffies, timeo)) {
- printk(KERN_WARNING "MTD %s(): software timeout\n",
-@@ -1652,6 +1653,7 @@ static int __xipram do_erase_chip(struct
- ret = -EIO;
- }
-
-+ op_done:
- chip->state = FL_READY;
- xip_enable(map, chip, adr);
- put_chip(map, chip, adr);
-@@ -1719,9 +1721,9 @@ static int __xipram do_erase_oneblock(st
- chip->erase_suspended = 0;
- }
-
-- if (chip_ready(map, adr)) {
-+ if (chip_good(map, adr, map_word_ff(map))) {
- xip_enable(map, chip, adr);
-- break;
-+ goto op_done;
- }
-
- if (time_after(jiffies, timeo)) {
-@@ -1743,6 +1745,7 @@ static int __xipram do_erase_oneblock(st
- ret = -EIO;
- }
-
-+ op_done:
- chip->state = FL_READY;
- put_chip(map, chip, adr);
- mutex_unlock(&chip->mutex);
diff --git a/target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch
deleted file mode 100644
index ea7c66f4d3..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/109-mtd-wrt160nl-trx-parser.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -176,6 +176,12 @@ config MTD_AR7_PARTS
-
- endif # MTD_PARTITIONS
-
-+config MTD_WRT160NL_PARTS
-+ tristate "Linksys WRT160NL partitioning support"
-+ depends on MTD_PARTITIONS && AR71XX_MACH_WRT160NL
-+ ---help---
-+ Linksys WRT160NL partitioning support
-+
- config MTD_MYLOADER_PARTS
- tristate "MyLoader partition parsing"
- depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
- obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
- obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
- obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
-+obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
- obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
-
- # 'Users' - code which presents functionality to userspace.
diff --git a/target/linux/ar71xx/patches-2.6.39/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.39/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
deleted file mode 100644
index 499655903e..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/drivers/usb/host/ehci-q.c
-+++ b/drivers/usb/host/ehci-q.c
-@@ -1183,6 +1183,9 @@ static void end_unlink_async (struct ehc
- ehci->reclaim = NULL;
- start_unlink_async (ehci, next);
- }
-+
-+ if (ehci->has_synopsys_hc_bug)
-+ writel((u32)ehci->async->qh_dma, &ehci->regs->async_next);
- }
-
- /* makes sure the async qh will become idle */
---- a/drivers/usb/host/ehci.h
-+++ b/drivers/usb/host/ehci.h
-@@ -135,6 +135,7 @@ struct ehci_hcd { /* one per controlle
- unsigned fs_i_thresh:1; /* Intel iso scheduling */
- unsigned use_dummy_qh:1; /* AMD Frame List table quirk*/
- unsigned ignore_oc:1;
-+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
-
- /* required for usb32 quirk */
- #define OHCI_CTRL_HCFS (3 << 6)
diff --git a/target/linux/ar71xx/patches-2.6.39/111-mtd-cfi_cmdset_0002-force-word-write.patch b/target/linux/ar71xx/patches-2.6.39/111-mtd-cfi_cmdset_0002-force-word-write.patch
deleted file mode 100644
index ad9a837e8b..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/111-mtd-cfi_cmdset_0002-force-word-write.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -39,7 +39,7 @@
- #include <linux/mtd/xip.h>
-
- #define AMD_BOOTLOC_BUG
--#define FORCE_WORD_WRITE 0
-+#define FORCE_WORD_WRITE 1
-
- #define MAX_WORD_RETRIES 3
-
-@@ -50,7 +50,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 *);
-+#if !FORCE_WORD_WRITE
- static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
-+#endif
- 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 *);
-@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m
- }
- #endif
-
-+#if !FORCE_WORD_WRITE
- static void fixup_use_write_buffers(struct mtd_info *mtd)
- {
- struct map_info *map = mtd->priv;
-@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru
- mtd->write = cfi_amdstd_write_buffers;
- }
- }
-+#endif /* !FORCE_WORD_WRITE */
-
- /* Atmel chips don't use the same PRI format as AMD chips */
- static void fixup_convert_atmel_pri(struct mtd_info *mtd)
-@@ -1379,6 +1383,7 @@ static int cfi_amdstd_write_words(struct
- /*
- * FIXME: interleaved mode not tested, and probably not supported!
- */
-+#if !FORCE_WORD_WRITE
- static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
- unsigned long adr, const u_char *buf,
- int len)
-@@ -1489,7 +1494,6 @@ static int __xipram do_write_buffer(stru
- return ret;
- }
-
--
- static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
- size_t *retlen, const u_char *buf)
- {
-@@ -1568,6 +1572,7 @@ static int cfi_amdstd_write_buffers(stru
-
- return 0;
- }
-+#endif /* !FORCE_WORD_WRITE */
-
- /*
- * Handle devices with one erase region, that only implement
diff --git a/target/linux/ar71xx/patches-2.6.39/112-mtd-tp-link-partition-parser.patch b/target/linux/ar71xx/patches-2.6.39/112-mtd-tp-link-partition-parser.patch
deleted file mode 100644
index 90bdfc9d4c..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/112-mtd-tp-link-partition-parser.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/mtd/Kconfig
-+++ b/drivers/mtd/Kconfig
-@@ -198,6 +198,12 @@ config MTD_MYLOADER_PARTS
- You will still need the parsing functions to be called by the driver
- for your particular device. It won't happen automatically.
-
-+config MTD_TPLINK_PARTS
-+ tristate "TP-Link AR7XXX/AR9XXX partitioning support"
-+ depends on MTD_PARTITIONS && ATHEROS_AR71XX
-+ ---help---
-+ TBD.
-+
- comment "User Modules And Translation Layers"
-
- config MTD_CHAR
---- a/drivers/mtd/Makefile
-+++ b/drivers/mtd/Makefile
-@@ -14,6 +14,7 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
- obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
- obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
- obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
-+obj-$(CONFIG_MTD_TPLINK_PARTS) += tplinkpart.o
-
- # 'Users' - code which presents functionality to userspace.
- obj-$(CONFIG_MTD_CHAR) += mtdchar.o
diff --git a/target/linux/ar71xx/patches-2.6.39/113-mtd-m25p80-allow-to-specify-max-read-size.patch b/target/linux/ar71xx/patches-2.6.39/113-mtd-m25p80-allow-to-specify-max-read-size.patch
deleted file mode 100644
index 8bb69df242..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/113-mtd-m25p80-allow-to-specify-max-read-size.patch
+++ /dev/null
@@ -1,112 +0,0 @@
---- a/drivers/mtd/devices/m25p80.c
-+++ b/drivers/mtd/devices/m25p80.c
-@@ -94,6 +94,7 @@ struct m25p {
- u16 addr_width;
- u8 erase_opcode;
- u8 *command;
-+ size_t max_read_len;
- };
-
- static inline struct m25p *mtd_to_m25p(struct mtd_info *mtd)
-@@ -341,6 +342,7 @@ static int m25p80_read(struct mtd_info *
- struct m25p *flash = mtd_to_m25p(mtd);
- struct spi_transfer t[2];
- struct spi_message m;
-+ loff_t ofs;
-
- DEBUG(MTD_DEBUG_LEVEL2, "%s: %s %s 0x%08x, len %zd\n",
- dev_name(&flash->spi->dev), __func__, "from",
-@@ -364,8 +366,6 @@ static int m25p80_read(struct mtd_info *
- t[0].len = m25p_cmdsz(flash) + FAST_READ_DUMMY_BYTE;
- spi_message_add_tail(&t[0], &m);
-
-- t[1].rx_buf = buf;
-- t[1].len = len;
- spi_message_add_tail(&t[1], &m);
-
- /* Byte count starts at zero. */
-@@ -373,13 +373,6 @@ static int m25p80_read(struct mtd_info *
-
- mutex_lock(&flash->lock);
-
-- /* Wait till previous write/erase is done. */
-- if (wait_till_ready(flash)) {
-- /* REVISIT status return?? */
-- mutex_unlock(&flash->lock);
-- return 1;
-- }
--
- /* FIXME switch to OPCODE_FAST_READ. It's required for higher
- * clocks; and at this writing, every chip this driver handles
- * supports that opcode.
-@@ -387,11 +380,44 @@ static int m25p80_read(struct mtd_info *
-
- /* Set up the write data buffer. */
- flash->command[0] = OPCODE_READ;
-- m25p_addr2cmd(flash, from, flash->command);
-
-- spi_sync(flash->spi, &m);
-+ ofs = 0;
-+ while (len) {
-+ size_t readlen;
-+ size_t done;
-+ int ret;
-+
-+ ret = wait_till_ready(flash);
-+ if (ret) {
-+ mutex_unlock(&flash->lock);
-+ return 1;
-+ }
-+
-+ if (flash->max_read_len > 0 &&
-+ flash->max_read_len < len)
-+ readlen = flash->max_read_len;
-+ else
-+ readlen = len;
-+
-+ t[1].rx_buf = buf + ofs;
-+ t[1].len = readlen;
-+
-+ m25p_addr2cmd(flash, from + ofs, flash->command);
-+
-+ spi_sync(flash->spi, &m);
-
-- *retlen = m.actual_length - m25p_cmdsz(flash) - FAST_READ_DUMMY_BYTE;
-+ done = m.actual_length - m25p_cmdsz(flash) -
-+ FAST_READ_DUMMY_BYTE;
-+ if (done != readlen) {
-+ mutex_unlock(&flash->lock);
-+ return 1;
-+ }
-+
-+ ofs += done;
-+ len -= done;
-+ }
-+
-+ *retlen = ofs;
-
- mutex_unlock(&flash->lock);
-
-@@ -901,6 +927,12 @@ static int __devinit m25p_probe(struct s
- flash->mtd.erase = m25p80_erase;
- flash->mtd.read = m25p80_read;
-
-+ if (data && data->max_read_len) {
-+ flash->max_read_len = data->max_read_len;
-+ dev_warn(&spi->dev, "max_read_len set to %d bytes\n",
-+ flash->max_read_len);
-+ }
-+
- /* sst flash chips use AAI word program */
- if (info->jedec_id >> 16 == 0xbf)
- flash->mtd.write = sst_write;
---- a/include/linux/spi/flash.h
-+++ b/include/linux/spi/flash.h
-@@ -26,6 +26,7 @@ struct flash_platform_data {
- char *type;
- const char **part_probes;
-
-+ size_t max_read_len;
- /* we'll likely add more ... use JEDEC IDs, etc */
- };
-
diff --git a/target/linux/ar71xx/patches-2.6.39/120-dsa-trailer-tag-validation-fix.patch b/target/linux/ar71xx/patches-2.6.39/120-dsa-trailer-tag-validation-fix.patch
deleted file mode 100644
index 3e3902bac0..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/120-dsa-trailer-tag-validation-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/net/dsa/tag_trailer.c
-+++ b/net/dsa/tag_trailer.c
-@@ -87,7 +87,7 @@ static int trailer_rcv(struct sk_buff *s
-
- trailer = skb_tail_pointer(skb) - 4;
- if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 ||
-- (trailer[3] & 0xef) != 0x00 || trailer[3] != 0x00)
-+ (trailer[2] & 0xef) != 0x00 || (trailer[3] & 0xfe) != 0x00)
- goto out_drop;
-
- source_port = trailer[1] & 7;
diff --git a/target/linux/ar71xx/patches-2.6.39/121-dsa-add-88e6063-driver.patch b/target/linux/ar71xx/patches-2.6.39/121-dsa-add-88e6063-driver.patch
deleted file mode 100644
index 1a11a69c6f..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/121-dsa-add-88e6063-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/net/dsa/Kconfig
-+++ b/net/dsa/Kconfig
-@@ -36,6 +36,13 @@ config NET_DSA_MV88E6060
- This enables support for the Marvell 88E6060 ethernet switch
- chip.
-
-+config NET_DSA_MV88E6063
-+ bool "Marvell 88E6063 ethernet switch chip support"
-+ select NET_DSA_TAG_TRAILER
-+ ---help---
-+ This enables support for the Marvell 88E6063 ethernet switch
-+ chip
-+
- config NET_DSA_MV88E6XXX_NEED_PPU
- bool
- default n
---- a/net/dsa/Makefile
-+++ b/net/dsa/Makefile
-@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag
- # switch drivers
- obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
- obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-+obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
- obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
- obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
-
diff --git a/target/linux/ar71xx/patches-2.6.39/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.39/140-redboot_partition_scan.patch
deleted file mode 100644
index a09271a069..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/140-redboot_partition_scan.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- a/drivers/mtd/redboot.c
-+++ b/drivers/mtd/redboot.c
-@@ -78,31 +78,32 @@ static int parse_redboot_partitions(stru
- static char nullstring[] = "unallocated";
- #endif
-
-+ buf = vmalloc(master->erasesize);
-+ if (!buf)
-+ return -ENOMEM;
-+
-+ restart:
- if ( directory < 0 ) {
- offset = master->size + directory * master->erasesize;
-- while (master->block_isbad &&
-+ while (master->block_isbad &&
- master->block_isbad(master, offset)) {
- if (!offset) {
- nogood:
- printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
-+ vfree(buf);
- return -EIO;
- }
- offset -= master->erasesize;
- }
- } else {
- offset = directory * master->erasesize;
-- while (master->block_isbad &&
-+ while (master->block_isbad &&
- master->block_isbad(master, offset)) {
- offset += master->erasesize;
- if (offset == master->size)
- goto nogood;
- }
- }
-- buf = vmalloc(master->erasesize);
--
-- if (!buf)
-- return -ENOMEM;
--
- printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
- master->name, offset);
-
-@@ -174,6 +175,11 @@ static int parse_redboot_partitions(stru
- }
- if (i == numslots) {
- /* Didn't find it */
-+ if (offset + master->erasesize < master->size) {
-+ /* not at the end of the flash yet, maybe next block :) */
-+ directory++;
-+ goto restart;
-+ }
- printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
- master->name);
- ret = 0;
diff --git a/target/linux/ar71xx/patches-2.6.39/150-drivers-link-spi-before-mtd.patch b/target/linux/ar71xx/patches-2.6.39/150-drivers-link-spi-before-mtd.patch
deleted file mode 100644
index f72f8ad07f..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/150-drivers-link-spi-before-mtd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/drivers/Makefile
-+++ b/drivers/Makefile
-@@ -46,8 +46,8 @@ obj-$(CONFIG_IDE) += ide/
- obj-$(CONFIG_SCSI) += scsi/
- obj-$(CONFIG_ATA) += ata/
- obj-$(CONFIG_TARGET_CORE) += target/
--obj-$(CONFIG_MTD) += mtd/
- obj-$(CONFIG_SPI) += spi/
-+obj-$(CONFIG_MTD) += mtd/
- obj-y += net/
- obj-$(CONFIG_ATM) += atm/
- obj-$(CONFIG_FUSION) += message/
diff --git a/target/linux/ar71xx/patches-2.6.39/151-spi-add-various-flags.patch b/target/linux/ar71xx/patches-2.6.39/151-spi-add-various-flags.patch
deleted file mode 100644
index b51f68f3ca..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/151-spi-add-various-flags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/include/linux/spi/spi.h
-+++ b/include/linux/spi/spi.h
-@@ -441,6 +441,8 @@ struct spi_transfer {
- dma_addr_t rx_dma;
-
- unsigned cs_change:1;
-+ unsigned verify:1;
-+ unsigned fast_write:1;
- u8 bits_per_word;
- u16 delay_usecs;
- u32 speed_hz;
-@@ -482,6 +484,7 @@ struct spi_message {
- struct spi_device *spi;
-
- unsigned is_dma_mapped:1;
-+ unsigned fast_read:1;
-
- /* REVISIT: we might want a flag affecting the behavior of the
- * last transfer ... allowing things like "read 16 bit length L"
diff --git a/target/linux/ar71xx/patches-2.6.39/152-rb4xx-spi-driver.patch b/target/linux/ar71xx/patches-2.6.39/152-rb4xx-spi-driver.patch
deleted file mode 100644
index 163d56d220..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/152-rb4xx-spi-driver.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -317,6 +317,12 @@ config SPI_PXA2XX
- config SPI_PXA2XX_PCI
- def_bool SPI_PXA2XX && X86_32 && PCI
-
-+config SPI_RB4XX
-+ tristate "Mikrotik RB4XX SPI master"
-+ depends on SPI_MASTER && AR71XX_MACH_RB4XX
-+ help
-+ SPI controller driver for the Mikrotik RB4xx series boards.
-+
- config SPI_S3C24XX
- tristate "Samsung S3C24XX series SPI"
- depends on ARCH_S3C2410 && EXPERIMENTAL
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -56,6 +56,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.
- obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o
- obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o
- obj-$(CONFIG_SPI_NUC900) += spi_nuc900.o
-+obj-$(CONFIG_SPI_RB4XX) += spi-rb4xx.o
-
- # special build for s3c24xx spi driver with fiq support
- spi_s3c24xx_hw-y := spi_s3c24xx.o
diff --git a/target/linux/ar71xx/patches-2.6.39/153-spi-rb4xx-cpld-driver.patch b/target/linux/ar71xx/patches-2.6.39/153-spi-rb4xx-cpld-driver.patch
deleted file mode 100644
index 0521d4de51..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/153-spi-rb4xx-cpld-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -479,6 +479,13 @@ config SPI_TLE62X0
- sysfs interface, with each line presented as a kind of GPIO
- exposing both switch control and diagnostic feedback.
-
-+config SPI_RB4XX_CPLD
-+ tristate "MikroTik RB4XX CPLD driver"
-+ depends on AR71XX_MACH_RB4XX
-+ help
-+ SPI driver for the Xilinx CPLD chip present on the
-+ MikroTik RB4xx boards.
-+
- #
- # Add new SPI protocol masters in alphabetical order above this line
- #
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -65,6 +65,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
- # ... add above this line ...
-
- # SPI protocol drivers (device/link on bus)
-+obj-$(CONFIG_SPI_RB4XX_CPLD) += spi-rb4xx-cpld.o
- obj-$(CONFIG_SPI_SPIDEV) += spidev.o
- obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
- # ... add above this line ...
diff --git a/target/linux/ar71xx/patches-2.6.39/200-rb4xx_nand_driver.patch b/target/linux/ar71xx/patches-2.6.39/200-rb4xx_nand_driver.patch
deleted file mode 100644
index 53c4db2998..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/200-rb4xx_nand_driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -531,4 +531,8 @@ config MTD_NAND_FSMC
- Enables support for NAND Flash chips on the ST Microelectronics
- Flexible Static Memory Controller (FSMC)
-
-+config MTD_NAND_RB4XX
-+ tristate "NAND flash driver for RouterBoard 4xx series"
-+ depends on MTD_NAND && AR71XX_MACH_RB4XX
-+
- endif # MTD_NAND
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -34,6 +34,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270) += cmx27
- obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
- obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
-+obj-$(CONFIG_MTD_NAND_RB4XX) += rb4xx_nand.o
- obj-$(CONFIG_MTD_ALAUDA) += alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
diff --git a/target/linux/ar71xx/patches-2.6.39/201-ap83_spi_controller.patch b/target/linux/ar71xx/patches-2.6.39/201-ap83_spi_controller.patch
deleted file mode 100644
index 46c96fb2d0..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/201-ap83_spi_controller.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -10,6 +10,7 @@ obj-$(CONFIG_SPI_MASTER) += spi.o
-
- # SPI master controller drivers (bus)
- obj-$(CONFIG_SPI_ALTERA) += spi_altera.o
-+obj-$(CONFIG_SPI_AP83) += spi-ap83.o
- obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o
- obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
- obj-$(CONFIG_SPI_ATH79) += ath79_spi.o
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -67,6 +67,14 @@ config SPI_ATH79
- This enables support for the SPI controller present on the
- Atheros AR71XX/AR724X/AR913X SoCs.
-
-+config SPI_AP83
-+ tristate "Atheros AP83 specific SPI Controller"
-+ depends on SPI_MASTER && AR71XX_MACH_AP83
-+ select SPI_BITBANG
-+ help
-+ This is a specific SPI controller driver for the Atheros AP83
-+ reference board.
-+
- config SPI_AR71XX
- tristate "Atheros AR71xx SPI Controller"
- depends on SPI_MASTER && ATHEROS_AR71XX
diff --git a/target/linux/ar71xx/patches-2.6.39/202-spi_vsc7385_driver.patch b/target/linux/ar71xx/patches-2.6.39/202-spi_vsc7385_driver.patch
deleted file mode 100644
index a98d940ef8..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/202-spi_vsc7385_driver.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -494,6 +494,11 @@ config SPI_RB4XX_CPLD
- SPI driver for the Xilinx CPLD chip present on the
- MikroTik RB4xx boards.
-
-+config SPI_VSC7385
-+ tristate "Vitesse VSC7385 ethernet switch driver"
-+ help
-+ SPI driver for the Vitesse VSC7385 ethernet switch.
-+
- #
- # Add new SPI protocol masters in alphabetical order above this line
- #
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -68,6 +68,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
- # SPI protocol drivers (device/link on bus)
- obj-$(CONFIG_SPI_RB4XX_CPLD) += spi-rb4xx-cpld.o
- obj-$(CONFIG_SPI_SPIDEV) += spidev.o
-+obj-$(CONFIG_SPI_VSC7385) += spi-vsc7385.o
- obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
- # ... add above this line ...
-
diff --git a/target/linux/ar71xx/patches-2.6.39/203-pb44_spi_controller.patch b/target/linux/ar71xx/patches-2.6.39/203-pb44_spi_controller.patch
deleted file mode 100644
index fb62e1d73d..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/203-pb44_spi_controller.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -82,6 +82,14 @@ config SPI_AR71XX
- help
- This is the SPI contoller driver for Atheros AR71xx.
-
-+config SPI_PB44
-+ tristate "Atheros PB44 board specific SPI controller"
-+ depends on SPI_MASTER && AR71XX_MACH_PB44
-+ select SPI_BITBANG
-+ help
-+ This is a specific SPI controller driver for the Atheros PB44
-+ reference board.
-+
- config SPI_ATMEL
- tristate "Atmel SPI Controller"
- depends on (ARCH_AT91 || AVR32)
---- a/drivers/spi/Makefile
-+++ b/drivers/spi/Makefile
-@@ -29,6 +29,7 @@ obj-$(CONFIG_SPI_GPIO) += spi_gpio.o
- obj-$(CONFIG_SPI_GPIO_OLD) += spi_gpio_old.o
- obj-$(CONFIG_SPI_IMX) += spi_imx.o
- obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70llp.o
-+obj-$(CONFIG_SPI_PB44) += pb44_spi.o
- obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
- obj-$(CONFIG_SPI_PXA2XX_PCI) += pxa2xx_spi_pci.o
- obj-$(CONFIG_SPI_OC_TINY) += spi_oc_tiny.o
diff --git a/target/linux/ar71xx/patches-2.6.39/205-wndr3700-usb-led-driver.patch b/target/linux/ar71xx/patches-2.6.39/205-wndr3700-usb-led-driver.patch
deleted file mode 100644
index 3c1fef9df1..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/205-wndr3700-usb-led-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -379,6 +379,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"
-+ depends on LEDS_CLASS && AR71XX_MACH_WNDR3700
-+ help
-+ This option enables support for the USB LED found on the
-+ NETGEAR WNDR3700 board.
-+
- comment "LED Triggers"
-
- config LEDS_TRIGGER_TIMER
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -33,6 +33,7 @@ obj-$(CONFIG_LEDS_DA903X) += leds-da903
- obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
- obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
- obj-$(CONFIG_LEDS_PWM) += leds-pwm.o
-+obj-${CONFIG_LEDS_WNDR3700_USB} += leds-wndr3700-usb.o
- obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o
- obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o
- obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o
diff --git a/target/linux/ar71xx/patches-2.6.39/206-nxp-74hc153-gpio-chip-driver.patch b/target/linux/ar71xx/patches-2.6.39/206-nxp-74hc153-gpio-chip-driver.patch
deleted file mode 100644
index 8299a883fc..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/206-nxp-74hc153-gpio-chip-driver.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/drivers/gpio/Kconfig
-+++ b/drivers/gpio/Kconfig
-@@ -419,4 +419,13 @@ config AB8500_GPIO
- depends on AB8500_CORE && BROKEN
- help
- Select this to enable the AB8500 IC GPIO driver
-+
-+comment "Other GPIO expanders"
-+
-+config GPIO_NXP_74HC153
-+ tristate "NXP 74HC153 Dual 4-input multiplexer"
-+ help
-+ Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
-+ provides a GPIO interface supporting input mode only.
-+
- endif
---- a/drivers/gpio/Makefile
-+++ b/drivers/gpio/Makefile
-@@ -18,6 +18,7 @@ obj-$(CONFIG_GPIO_MAX7301) += max7301.o
- obj-$(CONFIG_GPIO_MAX732X) += max732x.o
- obj-$(CONFIG_GPIO_MC33880) += mc33880.o
- obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
-+obj-$(CONFIG_GPIO_NXP_74HC153) += gpio-nxp-74hc153.o
- obj-$(CONFIG_GPIO_74X164) += 74x164.o
- obj-$(CONFIG_GPIO_PCA953X) += pca953x.o
- obj-$(CONFIG_GPIO_PCF857X) += pcf857x.o
diff --git a/target/linux/ar71xx/patches-2.6.39/207-rb750-led-driver.patch b/target/linux/ar71xx/patches-2.6.39/207-rb750-led-driver.patch
deleted file mode 100644
index 419c81495b..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/207-rb750-led-driver.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/drivers/leds/Kconfig
-+++ b/drivers/leds/Kconfig
-@@ -386,6 +386,10 @@ config LEDS_WNDR3700_USB
- This option enables support for the USB LED found on the
- NETGEAR WNDR3700 board.
-
-+config LEDS_RB750
-+ tristate "LED driver for the Mikrotik RouterBOARD 750"
-+ depends on LEDS_CLASS && AR71XX_MACH_RB750
-+
- comment "LED Triggers"
-
- config LEDS_TRIGGER_TIMER
---- a/drivers/leds/Makefile
-+++ b/drivers/leds/Makefile
-@@ -40,6 +40,7 @@ obj-$(CONFIG_LEDS_LT3593) += leds-lt359
- obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o
- obj-$(CONFIG_LEDS_DELL_NETBOOKS) += dell-led.o
- obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o
-+obj-$(CONFIG_LEDS_RB750) += leds-rb750.o
- obj-$(CONFIG_LEDS_NS2) += leds-ns2.o
- obj-$(CONFIG_LEDS_NETXBIG) += leds-netxbig.o
-
diff --git a/target/linux/ar71xx/patches-2.6.39/208-rb750-nand-driver.patch b/target/linux/ar71xx/patches-2.6.39/208-rb750-nand-driver.patch
deleted file mode 100644
index d48cdf565e..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/208-rb750-nand-driver.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/drivers/mtd/nand/Kconfig
-+++ b/drivers/mtd/nand/Kconfig
-@@ -535,4 +535,8 @@ config MTD_NAND_RB4XX
- tristate "NAND flash driver for RouterBoard 4xx series"
- depends on MTD_NAND && AR71XX_MACH_RB4XX
-
-+config MTD_NAND_RB750
-+ tristate "NAND flash driver for the RouterBoard 750"
-+ depends on MTD_NAND && AR71XX_MACH_RB750
-+
- endif # MTD_NAND
---- a/drivers/mtd/nand/Makefile
-+++ b/drivers/mtd/nand/Makefile
-@@ -35,6 +35,7 @@ obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx
- obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
- obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
- obj-$(CONFIG_MTD_NAND_RB4XX) += rb4xx_nand.o
-+obj-$(CONFIG_MTD_NAND_RB750) += rb750_nand.o
- obj-$(CONFIG_MTD_ALAUDA) += alauda.o
- obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
- obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
diff --git a/target/linux/ar71xx/patches-2.6.39/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.39/300-mips_fw_myloader.patch
deleted file mode 100644
index 7cf72f8efb..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/300-mips_fw_myloader.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/arch/mips/Makefile
-+++ b/arch/mips/Makefile
-@@ -181,6 +181,7 @@ endif
- #
- libs-$(CONFIG_ARC) += arch/mips/fw/arc/
- libs-$(CONFIG_CFE) += arch/mips/fw/cfe/
-+libs-$(CONFIG_MYLOADER) += arch/mips/fw/myloader/
- libs-$(CONFIG_SNIPROM) += arch/mips/fw/sni/
- libs-y += arch/mips/fw/lib/
-
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -933,6 +933,9 @@ config MIPS_NILE4
- config MIPS_DISABLE_OBSOLETE_IDE
- bool
-
-+config MYLOADER
-+ bool
-+
- config SYNC_R4K
- bool
-
diff --git a/target/linux/ar71xx/patches-2.6.39/400-mips-disable-ath79-platform.patch b/target/linux/ar71xx/patches-2.6.39/400-mips-disable-ath79-platform.patch
deleted file mode 100644
index 4f68cc7f0e..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/400-mips-disable-ath79-platform.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -757,7 +757,7 @@ endchoice
-
- source "arch/mips/alchemy/Kconfig"
- source "arch/mips/ar71xx/Kconfig"
--source "arch/mips/ath79/Kconfig"
-+# source "arch/mips/ath79/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
- source "arch/mips/jz4740/Kconfig"
diff --git a/target/linux/ar71xx/patches-2.6.39/500-ar933x-uart-driver.patch b/target/linux/ar71xx/patches-2.6.39/500-ar933x-uart-driver.patch
deleted file mode 100644
index 530d0576f9..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/500-ar933x-uart-driver.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- a/drivers/tty/serial/Kconfig
-+++ b/drivers/tty/serial/Kconfig
-@@ -1612,4 +1612,27 @@ config SERIAL_MXS_AUART_CONSOLE
- help
- Enable a MXS AUART port to be the system console.
-
-+config SERIAL_AR933X
-+ bool "AR933X serial port support"
-+ depends on SOC_AR933X
-+ select SERIAL_CORE
-+ help
-+ If you have an Atheros AR933X SOC based board and want to use the
-+ built-in UART of the SoC, say Y to this option.
-+
-+config SERIAL_AR933X_CONSOLE
-+ bool "Console on AR933X serial port"
-+ depends on SERIAL_AR933X=y
-+ select SERIAL_CORE_CONSOLE
-+ help
-+ Enable a built-in UART port of the AR933X to be the system console.
-+
-+config SERIAL_AR933X_NR_UARTS
-+ int "Maximum number of AR933X serial ports"
-+ depends on SERIAL_AR933X
-+ default "2"
-+ help
-+ Set this to the number of serial ports you want the driver
-+ to support.
-+
- endmenu
---- a/drivers/tty/serial/Makefile
-+++ b/drivers/tty/serial/Makefile
-@@ -94,3 +94,4 @@ obj-$(CONFIG_SERIAL_IFX6X60) += ifx6x6
- obj-$(CONFIG_SERIAL_PCH_UART) += pch_uart.o
- obj-$(CONFIG_SERIAL_MSM_SMD) += msm_smd_tty.o
- obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
-+obj-$(CONFIG_SERIAL_AR933X) += ar933x_uart.o
---- a/include/linux/serial_core.h
-+++ b/include/linux/serial_core.h
-@@ -202,6 +202,10 @@
- /* VIA VT8500 SoC */
- #define PORT_VT8500 97
-
-+/* Atheros AR933X SoC */
-+#define PORT_AR933X 99
-+
-+
- #ifdef __KERNEL__
-
- #include <linux/compiler.h>
diff --git a/target/linux/ar71xx/patches-2.6.39/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.39/901-get_c0_compare_irq_function.patch
deleted file mode 100644
index 71b0b3f3e2..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/901-get_c0_compare_irq_function.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/arch/mips/kernel/traps.c
-+++ b/arch/mips/kernel/traps.c
-@@ -54,6 +54,7 @@
- #include <asm/types.h>
- #include <asm/stacktrace.h>
- #include <asm/uasm.h>
-+#include <asm/time.h>
-
- extern void check_wait(void);
- extern asmlinkage void r4k_wait(void);
-@@ -1576,6 +1577,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;
-+ if (get_c0_compare_irq)
-+ cp0_compare_irq = get_c0_compare_irq();
- cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
- if (cp0_perfcount_irq == cp0_compare_irq)
- cp0_perfcount_irq = -1;
---- a/arch/mips/include/asm/time.h
-+++ b/arch/mips/include/asm/time.h
-@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
- */
- #ifdef CONFIG_CEVT_R4K_LIB
- extern unsigned int __weak get_c0_compare_int(void);
-+extern unsigned int __weak get_c0_compare_irq(void);
- extern int r4k_clockevent_init(void);
- #endif
-
diff --git a/target/linux/ar71xx/patches-2.6.39/902-fix-occasional-kernel-hangs-during-boot.patch b/target/linux/ar71xx/patches-2.6.39/902-fix-occasional-kernel-hangs-during-boot.patch
deleted file mode 100644
index 8150ee4810..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/902-fix-occasional-kernel-hangs-during-boot.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From patchwork Tue Nov 8 14:59:01 2011
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: MIPS: Kernel hangs occasionally during boot.
-Date: Tue, 08 Nov 2011 13:59:01 -0000
-From: Al Cooper <alcooperx@gmail.com>
-X-Patchwork-Id: 2911
-Message-Id: <1320764341-4275-1-git-send-email-alcooperx@gmail.com>
-To: ralf@linux-mips.org, linux-mips@linux-mips.org,
- linux-kernel@vger.kernel.org
-Cc: "Al Cooper" <alcooperx@gmail.com>
-
-The Kernel hangs occasionally during boot after
-"Calibrating delay loop..". This is caused by the
-c0_compare_int_usable() routine in cevt-r4k.c returning false which
-causes the system to disable the timer and hang later. The false
-return happens because the routine is using a series of four calls to
-irq_disable_hazard() as a delay while it waits for the timer changes
-to propagate to the cp0 cause register. On newer MIPS cores, like the 74K,
-the series of irq_disable_hazard() calls turn into ehb instructions and
-can take as little as a few clock ticks for all 4 instructions. This
-is not enough of a delay, so the routine thinks the timer is not working.
-This fix uses up to a max number of cycle counter ticks for the delay
-and uses back_to_back_c0_hazard() instead of irq_disable_hazard() to
-handle the hazard condition between cp0 writes and cp0 reads.
-
-Signed-off-by: Al Cooper <alcooperx@gmail.com>
-
----
-arch/mips/kernel/cevt-r4k.c | 38 +++++++++++++++++++-------------------
- 1 files changed, 19 insertions(+), 19 deletions(-)
-
---- a/arch/mips/kernel/cevt-r4k.c
-+++ b/arch/mips/kernel/cevt-r4k.c
-@@ -103,19 +103,10 @@ static int c0_compare_int_pending(void)
-
- /*
- * Compare interrupt can be routed and latched outside the core,
-- * so a single execution hazard barrier may not be enough to give
-- * it time to clear as seen in the Cause register. 4 time the
-- * pipeline depth seems reasonably conservative, and empirically
-- * works better in configurations with high CPU/bus clock ratios.
-+ * so wait up to worst case number of cycle counter ticks for timer interrupt
-+ * changes to propagate to the cause register.
- */
--
--#define compare_change_hazard() \
-- do { \
-- irq_disable_hazard(); \
-- irq_disable_hazard(); \
-- irq_disable_hazard(); \
-- irq_disable_hazard(); \
-- } while (0)
-+#define COMPARE_INT_SEEN_TICKS 50
-
- int c0_compare_int_usable(void)
- {
-@@ -126,8 +117,12 @@ int c0_compare_int_usable(void)
- * IP7 already pending? Try to clear it by acking the timer.
- */
- if (c0_compare_int_pending()) {
-- write_c0_compare(read_c0_count());
-- compare_change_hazard();
-+ cnt = read_c0_count();
-+ write_c0_compare(cnt);
-+ back_to_back_c0_hazard();
-+ while (read_c0_count() < (cnt + COMPARE_INT_SEEN_TICKS))
-+ if (!c0_compare_int_pending())
-+ break;
- if (c0_compare_int_pending())
- return 0;
- }
-@@ -136,7 +131,7 @@ int c0_compare_int_usable(void)
- cnt = read_c0_count();
- cnt += delta;
- write_c0_compare(cnt);
-- compare_change_hazard();
-+ back_to_back_c0_hazard();
- if ((int)(read_c0_count() - cnt) < 0)
- break;
- /* increase delta if the timer was already expired */
-@@ -145,12 +140,17 @@ int c0_compare_int_usable(void)
- while ((int)(read_c0_count() - cnt) <= 0)
- ; /* Wait for expiry */
-
-- compare_change_hazard();
-+ while (read_c0_count() < (cnt + COMPARE_INT_SEEN_TICKS))
-+ if (c0_compare_int_pending())
-+ break;
- if (!c0_compare_int_pending())
- return 0;
--
-- write_c0_compare(read_c0_count());
-- compare_change_hazard();
-+ cnt = read_c0_count();
-+ write_c0_compare(cnt);
-+ back_to_back_c0_hazard();
-+ while (read_c0_count() < (cnt + COMPARE_INT_SEEN_TICKS))
-+ if (!c0_compare_int_pending())
-+ break;
- if (c0_compare_int_pending())
- return 0;
-
diff --git a/target/linux/ar71xx/patches-2.6.39/910-unaligned_access_hacks.patch b/target/linux/ar71xx/patches-2.6.39/910-unaligned_access_hacks.patch
deleted file mode 100644
index 921cf194d6..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/910-unaligned_access_hacks.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- a/arch/mips/include/asm/checksum.h
-+++ b/arch/mips/include/asm/checksum.h
-@@ -12,6 +12,7 @@
- #define _ASM_CHECKSUM_H
-
- #include <linux/in6.h>
-+#include <linux/unaligned/packed_struct.h>
-
- #include <asm/uaccess.h>
-
-@@ -104,26 +105,30 @@ static inline __sum16 ip_fast_csum(const
- const unsigned int *stop = word + ihl;
- unsigned int csum;
- int carry;
-+ unsigned int w;
-
-- csum = word[0];
-- csum += word[1];
-- carry = (csum < word[1]);
-+ csum = __get_unaligned_cpu32(word++);
-+
-+ w = __get_unaligned_cpu32(word++);
-+ csum += w;
-+ carry = (csum < w);
- csum += carry;
-
-- csum += word[2];
-- carry = (csum < word[2]);
-+ w = __get_unaligned_cpu32(word++);
-+ csum += w;
-+ carry = (csum < w);
- csum += carry;
-
-- csum += word[3];
-- carry = (csum < word[3]);
-+ w = __get_unaligned_cpu32(word++);
-+ csum += w;
-+ carry = (csum < w);
- csum += carry;
-
-- word += 4;
- do {
-- csum += *word;
-- carry = (csum < *word);
-+ w = __get_unaligned_cpu32(word++);
-+ csum += w;
-+ carry = (csum < w);
- csum += carry;
-- word++;
- } while (word != stop);
-
- return csum_fold(csum);
---- a/include/linux/ip.h
-+++ b/include/linux/ip.h
-@@ -102,7 +102,7 @@ struct iphdr {
- __be32 saddr;
- __be32 daddr;
- /*The options start here. */
--};
-+} __packed;
-
- #ifdef __KERNEL__
- #include <linux/skbuff.h>
---- a/include/linux/ipv6.h
-+++ b/include/linux/ipv6.h
-@@ -126,7 +126,7 @@ struct ipv6hdr {
-
- struct in6_addr saddr;
- struct in6_addr daddr;
--};
-+} __packed;
-
- #ifdef __KERNEL__
- /*
---- a/include/linux/tcp.h
-+++ b/include/linux/tcp.h
-@@ -54,7 +54,7 @@ struct tcphdr {
- __be16 window;
- __sum16 check;
- __be16 urg_ptr;
--};
-+} __packed;
-
- /*
- * The union cast uses a gcc extension to avoid aliasing problems
---- a/include/linux/udp.h
-+++ b/include/linux/udp.h
-@@ -24,7 +24,7 @@ struct udphdr {
- __be16 dest;
- __be16 len;
- __sum16 check;
--};
-+} __packed;
-
- /* UDP socket options */
- #define UDP_CORK 1 /* Never send partially complete segments */
---- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
-+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c
-@@ -14,6 +14,7 @@
- #include <linux/skbuff.h>
- #include <linux/icmp.h>
- #include <linux/sysctl.h>
-+#include <linux/unaligned/packed_struct.h>
- #include <net/route.h>
- #include <net/ip.h>
-
-@@ -44,8 +45,8 @@ static bool ipv4_pkt_to_tuple(const stru
- if (ap == NULL)
- return false;
-
-- tuple->src.u3.ip = ap[0];
-- tuple->dst.u3.ip = ap[1];
-+ tuple->src.u3.ip = __get_unaligned_cpu32(ap++);
-+ tuple->dst.u3.ip = __get_unaligned_cpu32(ap);
-
- return true;
- }
diff --git a/target/linux/ar71xx/patches-2.6.39/920-mdio_bitbang_ignore_ta_value.patch b/target/linux/ar71xx/patches-2.6.39/920-mdio_bitbang_ignore_ta_value.patch
deleted file mode 100644
index 39584aabfa..0000000000
--- a/target/linux/ar71xx/patches-2.6.39/920-mdio_bitbang_ignore_ta_value.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/drivers/net/phy/mdio-bitbang.c
-+++ b/drivers/net/phy/mdio-bitbang.c
-@@ -165,16 +165,7 @@ static int mdiobb_read(struct mii_bus *b
-
- ctrl->ops->set_mdio_dir(ctrl, 0);
-
-- /* check the turnaround bit: the PHY should be driving it to zero */
-- if (mdiobb_get_bit(ctrl) != 0) {
-- /* PHY didn't drive TA low -- flush any bits it
-- * may be trying to send.
-- */
-- for (i = 0; i < 32; i++)
-- mdiobb_get_bit(ctrl);
--
-- return 0xffff;
-- }
-+ mdiobb_get_bit(ctrl);
-
- ret = mdiobb_get_num(ctrl, 16);
- mdiobb_get_bit(ctrl);