[ar71xx] add patches for 2.6.31

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17366 3c298f89-4303-0410-b956-a3cf2f4a3e73

31 files changed, 876 insertions, 0 deletions

diff --git a/target/linux/ar71xx/patches-2.6.31/001-ar71xx_core.patch b/target/linux/ar71xx/patches-2.6.31/001-ar71xx_core.patch
new file mode 100644
index 000000000..9c84eeae9
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/001-ar71xx_core.patch
@@ -0,0 +1,50 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -612,6 +612,13 @@ else
+ load-$(CONFIG_CPU_CAVIUM_OCTEON) 	+= 0xffffffff81100000
+ endif
+ 
++#
++# 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
++
+ # temporary until string.h is fixed
+ cflags-y += -ffreestanding
+ 
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -42,6 +42,23 @@ config AR7
+ 	  Support for the Texas Instruments AR7 System-on-a-Chip
+ 	  family: TNETD7100, 7200 and 7300.
+ 
++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 BASLER_EXCITE
+ 	bool "Basler eXcite smart camera"
+ 	select CEVT_R4K
+@@ -659,6 +676,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
+ endchoice
+ 
+ source "arch/mips/alchemy/Kconfig"
++source "arch/mips/ar71xx/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"
+ source "arch/mips/lasat/Kconfig"
diff --git a/target/linux/ar71xx/patches-2.6.31/002-ar71xx_pci.patch b/target/linux/ar71xx/patches-2.6.31/002-ar71xx_pci.patch
new file mode 100644
index 000000000..737c21f10
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/002-ar71xx_pci.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/pci/Makefile
++++ b/arch/mips/pci/Makefile
+@@ -16,6 +16,7 @@ obj-$(CONFIG_PCI_VR41XX)	+= ops-vr41xx.o
+ obj-$(CONFIG_NEC_MARKEINS)	+= ops-emma2rh.o pci-emma2rh.o fixup-emma2rh.o
+ obj-$(CONFIG_PCI_TX4927)	+= ops-tx4927.o
+ obj-$(CONFIG_BCM47XX)		+= pci-bcm47xx.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.31/003-ar71xx_usb_host.patch b/target/linux/ar71xx/patches-2.6.31/003-ar71xx_usb_host.patch
new file mode 100644
index 000000000..c2f14b2af
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/003-ar71xx_usb_host.patch
@@ -0,0 +1,58 @@
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
+@@ -98,6 +98,13 @@ config USB_EHCI_BIG_ENDIAN_DESC
+ 	depends on USB_EHCI_HCD && (440EPX || ARCH_IXP4XX)
+ 	default y
+ 
++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
+@@ -171,6 +178,13 @@ config USB_OHCI_HCD
+ 	  To compile this driver as a module, choose M here: the
+ 	  module will be called ohci-hcd.
+ 
++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
+@@ -1117,6 +1117,11 @@ MODULE_LICENSE ("GPL");
+ #define	PLATFORM_DRIVER		ixp4xx_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)
+ #error "missing bus glue for ehci-hcd"
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -1081,6 +1081,11 @@ MODULE_LICENSE ("GPL");
+ #define TMIO_OHCI_DRIVER	ohci_hcd_tmio_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(OF_PLATFORM_DRIVER) &&	\
diff --git a/target/linux/ar71xx/patches-2.6.31/004-ar71xx_spi_controller.patch b/target/linux/ar71xx/patches-2.6.31/004-ar71xx_spi_controller.patch
new file mode 100644
index 000000000..9c196e077
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/004-ar71xx_spi_controller.patch
@@ -0,0 +1,26 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -53,6 +53,13 @@ if SPI_MASTER
+ 
+ comment "SPI Master Controller Drivers"
+ 
++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
+@@ -11,6 +11,7 @@ endif
+ obj-$(CONFIG_SPI_MASTER)		+= spi.o
+ 
+ # SPI master controller drivers (bus)
++obj-$(CONFIG_SPI_AR71XX)		+= ar71xx_spi.o
+ obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
+ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
+ obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
diff --git a/target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch b/target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch
new file mode 100644
index 000000000..1ebd79053
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/005-ar71xx_mac_driver.patch
@@ -0,0 +1,21 @@
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
+@@ -2101,6 +2101,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
+@@ -103,6 +103,7 @@ obj-$(CONFIG_MII) += mii.o
+ obj-$(CONFIG_MDIO) += mdio.o
+ obj-$(CONFIG_PHYLIB) += phy/
+ 
++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.31/006-ar71xx_wdt_driver.patch b/target/linux/ar71xx/patches-2.6.31/006-ar71xx_wdt_driver.patch
new file mode 100644
index 000000000..08e58e221
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/006-ar71xx_wdt_driver.patch
@@ -0,0 +1,26 @@
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
+@@ -805,6 +805,13 @@ config TXX9_WDT
+ 	help
+ 	  Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
+ 
++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
+@@ -110,6 +110,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o
+ obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
+ obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
+ obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
++obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
+ 
+ # PARISC Architecture
+ 
diff --git a/target/linux/ar71xx/patches-2.6.31/007-ar91xx_flash_driver.patch b/target/linux/ar71xx/patches-2.6.31/007-ar91xx_flash_driver.patch
new file mode 100644
index 000000000..244d820da
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/007-ar91xx_flash_driver.patch
@@ -0,0 +1,26 @@
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -259,6 +259,13 @@ config MTD_ALCHEMY
+ 	help
+ 	  Flash memory access on AMD Alchemy Pb/Db/RDK Reference 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_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
+@@ -41,6 +41,7 @@ obj-$(CONFIG_MTD_DBOX2)		+= dbox2-flash.
+ obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
+ obj-$(CONFIG_MTD_PCI)		+= pci.o
+ obj-$(CONFIG_MTD_ALCHEMY)       += alchemy-flash.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.31/100-mtd_m25p80_add_pm25lv_flash_support.patch b/target/linux/ar71xx/patches-2.6.31/100-mtd_m25p80_add_pm25lv_flash_support.patch
new file mode 100644
index 000000000..d5b89ad82
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/100-mtd_m25p80_add_pm25lv_flash_support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -503,6 +503,10 @@ static struct flash_info __devinitdata m
+ 	/* Macronix */
+ 	{ "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
+ 
++	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
++	{ "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
++	{ "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
++
+ 	/* Spansion -- single (large) sector size only, at least
+ 	 * for the chips listed here (without boot sectors).
+ 	 */
diff --git a/target/linux/ar71xx/patches-2.6.31/101-ksz8041_phy_driver.patch b/target/linux/ar71xx/patches-2.6.31/101-ksz8041_phy_driver.patch
new file mode 100644
index 000000000..d02addb87
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/101-ksz8041_phy_driver.patch
@@ -0,0 +1,24 @@
+--- a/drivers/net/phy/Kconfig
++++ b/drivers/net/phy/Kconfig
+@@ -108,6 +108,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
+@@ -20,6 +20,7 @@ obj-$(CONFIG_REALTEK_PHY)	+= realtek.o
+ obj-$(CONFIG_AR8216_PHY)	+= ar8216.o
+ obj-$(CONFIG_RTL8306_PHY)	+= rtl8306.o
+ obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o
++obj-$(CONFIG_MICREL)		+= 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.31/102-mtd_m25p80_add_myloader_parser.patch b/target/linux/ar71xx/patches-2.6.31/102-mtd_m25p80_add_myloader_parser.patch
new file mode 100644
index 000000000..be84b35a7
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/102-mtd_m25p80_add_myloader_parser.patch
@@ -0,0 +1,19 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -722,6 +722,16 @@ static int __devinit m25p_probe(struct s
+ 					part_probes, &parts, 0);
+ 		}
+ 
++#ifdef CONFIG_MTD_MYLOADER_PARTS
++		if (nr_parts <= 0) {
++			static const char *part_probes[]
++					= { "MyLoader", NULL, };
++
++			nr_parts = parse_mtd_partitions(&flash->mtd,
++					part_probes, &parts, 0);
++		}
++#endif
++
+ 		if (nr_parts <= 0 && data && data->parts) {
+ 			parts = data->parts;
+ 			nr_parts = data->nr_parts;
diff --git a/target/linux/ar71xx/patches-2.6.31/103-mtd_m25p80_add_en25pxx_support.patch b/target/linux/ar71xx/patches-2.6.31/103-mtd_m25p80_add_en25pxx_support.patch
new file mode 100644
index 000000000..0b53151ae
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/103-mtd_m25p80_add_en25pxx_support.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -503,6 +503,10 @@ static struct flash_info __devinitdata m
+ 	/* Macronix */
+ 	{ "mx25l12805d", 0xc22018, 0, 64 * 1024, 256, },
+ 
++	/* EON -- en25pxx */
++	{ "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
++	{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
++
+ 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
+ 	{ "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
+ 	{ "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
diff --git a/target/linux/ar71xx/patches-2.6.31/104-mtd_m25p80_add_redboot_parser.patch b/target/linux/ar71xx/patches-2.6.31/104-mtd_m25p80_add_redboot_parser.patch
new file mode 100644
index 000000000..105778a99
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/104-mtd_m25p80_add_redboot_parser.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -736,6 +736,15 @@ static int __devinit m25p_probe(struct s
+ 		}
+ #endif
+ 
++#ifdef CONFIG_MTD_REDBOOT_PARTS
++		if (nr_parts <= 0) {
++			static const char *part_probes[]
++					= { "RedBoot", NULL, };
++
++			nr_parts = parse_mtd_partitions(&flash->mtd,
++					part_probes, &parts, 0);
++		}
++#endif
+ 		if (nr_parts <= 0 && data && data->parts) {
+ 			parts = data->parts;
+ 			nr_parts = data->nr_parts;
diff --git a/target/linux/ar71xx/patches-2.6.31/105-mtd_m25p80_add_mx25lxxx_support.patch b/target/linux/ar71xx/patches-2.6.31/105-mtd_m25p80_add_mx25lxxx_support.patch
new file mode 100644
index 000000000..d4b8ee93e
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/105-mtd_m25p80_add_mx25lxxx_support.patch
@@ -0,0 +1,14 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -507,6 +507,11 @@ static struct flash_info __devinitdata m
+ 	{ "en25p32", 0x1c2016, 0, 64 * 1024,  64, },
+ 	{ "en25p64", 0x1c2017, 0, 64 * 1024, 128, },
+ 
++	/* Macronix -- mx25lxxx */
++	{ "mx25l32",  0xc22016, 0, 64 * 1024,  64, },
++	{ "mx25l64",  0xc22017, 0, 64 * 1024, 128, },
++	{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
++
+ 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
+ 	{ "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
+ 	{ "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
diff --git a/target/linux/ar71xx/patches-2.6.31/106-mtd_m25p80_add_xxxs33b_support.patch b/target/linux/ar71xx/patches-2.6.31/106-mtd_m25p80_add_xxxs33b_support.patch
new file mode 100644
index 000000000..e4e01637d
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/106-mtd_m25p80_add_xxxs33b_support.patch
@@ -0,0 +1,14 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -512,6 +512,11 @@ static struct flash_info __devinitdata m
+ 	{ "mx25l64",  0xc22017, 0, 64 * 1024, 128, },
+ 	{ "mx25l128", 0xc22018, 0, 64 * 1024, 256, },
+ 
++	/* Numonyx -- xxxs33b */
++	{ "160s33b",  0x898911, 0, 64 * 1024,  64, },
++	{ "320s33b",  0x898912, 0, 64 * 1024, 128, },
++	{ "640s33b",  0x898913, 0, 64 * 1024, 256, },
++
+ 	/* PMC -- pm25x "blocks" are 32K, sectors are 4K */
+ 	{ "pm25lv512",         0, 32 * 1024, 2, SECT_4K },
+ 	{ "pm25lv010",         0, 32 * 1024, 4, SECT_4K },
diff --git a/target/linux/ar71xx/patches-2.6.31/107-mtd-SST39VF6401B-support.patch b/target/linux/ar71xx/patches-2.6.31/107-mtd-SST39VF6401B-support.patch
new file mode 100644
index 000000000..93f9176b2
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/107-mtd-SST39VF6401B-support.patch
@@ -0,0 +1,29 @@
+--- a/drivers/mtd/chips/jedec_probe.c
++++ b/drivers/mtd/chips/jedec_probe.c
+@@ -160,6 +160,7 @@
+ #define SST39LF160	0x2782
+ #define SST39VF1601	0x234b
+ #define SST39VF3201	0x235b
++#define SST39VF6401B	0x236d
+ #define SST39LF512	0x00D4
+ #define SST39LF010	0x00D5
+ #define SST39LF020	0x00D6
+@@ -1531,6 +1532,18 @@ static const struct amd_flash_info jedec
+ 			ERASEINFO(0x10000,64),
+ 		}
+ 	}, {
++		.mfr_id         = MANUFACTURER_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		= MANUFACTURER_ST,
+ 		.dev_id		= M29F800AB,
+ 		.name		= "ST M29F800AB",
diff --git a/target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch b/target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
new file mode 100644
index 000000000..3f25b61dd
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/108-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
@@ -0,0 +1,20 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1579,7 +1579,7 @@ static int __xipram do_erase_chip(struct
+ 			chip->erase_suspended = 0;
+ 		}
+ 
+-		if (chip_ready(map, adr))
++		if (chip_good(map, adr, map_word_ff(map)))
+ 			break;
+ 
+ 		if (time_after(jiffies, timeo)) {
+@@ -1667,7 +1667,7 @@ 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;
+ 		}
diff --git a/target/linux/ar71xx/patches-2.6.31/109-mtd-wrt160nl-trx-parser.patch b/target/linux/ar71xx/patches-2.6.31/109-mtd-wrt160nl-trx-parser.patch
new file mode 100644
index 000000000..4ab53a48d
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/109-mtd-wrt160nl-trx-parser.patch
@@ -0,0 +1,44 @@
+--- a/drivers/mtd/devices/m25p80.c
++++ b/drivers/mtd/devices/m25p80.c
+@@ -755,6 +755,16 @@ static int __devinit m25p_probe(struct s
+ 					part_probes, &parts, 0);
+ 		}
+ #endif
++
++#ifdef CONFIG_MTD_WRT160NL_PARTS
++		if (nr_parts <= 0) {
++			static const char *part_probes[]
++					= { "wrt160nl", NULL, };
++
++			nr_parts = parse_mtd_partitions(&flash->mtd,
++					part_probes, &parts, 0);
++		}
++#endif
+ 		if (nr_parts <= 0 && data && data->parts) {
+ 			parts = data->parts;
+ 			nr_parts = data->nr_parts;
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
+@@ -181,6 +181,12 @@ config MTD_AR7_PARTS
+ 	---help---
+ 	  TI AR7 partitioning support
+ 
++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_OF_PARTS)      += ofpart.o
+ obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
+ 
diff --git a/target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch b/target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
new file mode 100644
index 000000000..a61499965
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/110-usb-ehci-add-war-for-synopsys-hc-bug.patch
@@ -0,0 +1,22 @@
+--- a/drivers/usb/host/ehci-q.c
++++ b/drivers/usb/host/ehci-q.c
+@@ -1128,6 +1128,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
+@@ -126,6 +126,7 @@ struct ehci_hcd {			/* one per controlle
+ 	unsigned		big_endian_mmio:1;
+ 	unsigned		big_endian_desc:1;
+ 	unsigned		has_amcc_usb23: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.31/140-redboot_partition_scan.patch b/target/linux/ar71xx/patches-2.6.31/140-redboot_partition_scan.patch
new file mode 100644
index 000000000..289d4eb99
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/140-redboot_partition_scan.patch
@@ -0,0 +1,54 @@
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -60,31 +60,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);
+ 
+@@ -156,6 +157,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.31/200-rb4xx_nand_driver.patch b/target/linux/ar71xx/patches-2.6.31/200-rb4xx_nand_driver.patch
new file mode 100644
index 000000000..020793086
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/200-rb4xx_nand_driver.patch
@@ -0,0 +1,21 @@
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -452,4 +452,8 @@ config MTD_NAND_SOCRATES
+ 	help
+ 	  Enables support for NAND Flash chips wired onto Socrates board.
+ 
++config MTD_NAND_RB4XX
++	tristate "NAND flash driver for RouterBoard 4xx series"
++	depends on MTD_NAND && ATHEROS_AR71XX
++
+ endif # MTD_NAND
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE)	+= 
+ 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.31/201-ap83_spi_controller.patch b/target/linux/ar71xx/patches-2.6.31/201-ap83_spi_controller.patch
new file mode 100644
index 000000000..a8e889a7b
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/201-ap83_spi_controller.patch
@@ -0,0 +1,27 @@
+--- a/drivers/spi/Makefile
++++ b/drivers/spi/Makefile
+@@ -11,6 +11,7 @@ endif
+ obj-$(CONFIG_SPI_MASTER)		+= spi.o
+ 
+ # SPI master controller drivers (bus)
++obj-$(CONFIG_SPI_AP83)			+= ap83_spi.o
+ obj-$(CONFIG_SPI_AR71XX)		+= ar71xx_spi.o
+ obj-$(CONFIG_SPI_ATMEL)			+= atmel_spi.o
+ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -53,6 +53,14 @@ if SPI_MASTER
+ 
+ comment "SPI Master Controller Drivers"
+ 
++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.31/202-spi_vsc7385_driver.patch b/target/linux/ar71xx/patches-2.6.31/202-spi_vsc7385_driver.patch
new file mode 100644
index 000000000..d8f61bb90
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/202-spi_vsc7385_driver.patch
@@ -0,0 +1,24 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -279,6 +279,11 @@ config SPI_TLE62X0
+ 	  sysfs interface, with each line presented as a kind of GPIO
+ 	  exposing both switch control and diagnostic feedback.
+ 
++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
+@@ -38,6 +38,7 @@ obj-$(CONFIG_SPI_SH_SCI)		+= spi_sh_sci.
+ 
+ # SPI protocol drivers (device/link on bus)
+ 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.31/203-pb44_spi_controller.patch b/target/linux/ar71xx/patches-2.6.31/203-pb44_spi_controller.patch
new file mode 100644
index 000000000..e48710ca9
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/203-pb44_spi_controller.patch
@@ -0,0 +1,27 @@
+--- a/drivers/spi/Kconfig
++++ b/drivers/spi/Kconfig
+@@ -68,6 +68,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
+@@ -22,6 +22,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_OMAP_UWIRE)		+= omap_uwire.o
+ obj-$(CONFIG_SPI_OMAP24XX)		+= omap2_mcspi.o
diff --git a/target/linux/ar71xx/patches-2.6.31/300-mips_fw_myloader.patch b/target/linux/ar71xx/patches-2.6.31/300-mips_fw_myloader.patch
new file mode 100644
index 000000000..bad0423eb
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/300-mips_fw_myloader.patch
@@ -0,0 +1,22 @@
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -165,6 +165,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
+@@ -863,6 +863,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.31/301-enable_prom_emulator.patch b/target/linux/ar71xx/patches-2.6.31/301-enable_prom_emulator.patch
new file mode 100644
index 000000000..8b1609b1f
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/301-enable_prom_emulator.patch
@@ -0,0 +1,10 @@
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -56,6 +56,7 @@ config ATHEROS_AR71XX
+ 	select SYS_SUPPORTS_BIG_ENDIAN
+ 	select SYS_HAS_EARLY_PRINTK
+ 	select MIPS_MACHINE
++	select PROM_EMU
+ 	help
+ 	  Support for Atheros AR71xx based boards.
+ 
diff --git a/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch b/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
new file mode 100644
index 000000000..aca39a431
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/800-ag71xx-remove-netdev-arg-from-napi-calls.patch
@@ -0,0 +1,38 @@
+--- a/drivers/net/ag71xx/ag71xx_main.c
++++ b/drivers/net/ag71xx/ag71xx_main.c
+@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
+ 	struct net_device *dev = (struct net_device *) data;
+ 	struct ag71xx *ag = netdev_priv(dev);
+ 
+-	netif_rx_schedule(dev, &ag->napi);
++	netif_rx_schedule(&ag->napi);
+ }
+ 
+ static void ag71xx_tx_timeout(struct net_device *dev)
+@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
+ 		DBG("%s: disable polling mode, done=%d, limit=%d\n",
+ 			dev->name, done, limit);
+ 
+-		netif_rx_complete(dev, napi);
++		netif_rx_complete(napi);
+ 
+ 		/* enable interrupts */
+ 		spin_lock_irqsave(&ag->lock, flags);
+@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
+ 		printk(KERN_DEBUG "%s: out of memory\n", dev->name);
+ 
+ 	mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
+-	netif_rx_complete(dev, napi);
++	netif_rx_complete(napi);
+ 	return 0;
+ }
+ 
+@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int 
+ 	if (likely(status & AG71XX_INT_POLL)) {
+ 		ag71xx_int_disable(ag, AG71XX_INT_POLL);
+ 		DBG("%s: enable polling mode\n", dev->name);
+-		netif_rx_schedule(dev, &ag->napi);
++		netif_rx_schedule(&ag->napi);
+ 	}
+ 
+ 	return IRQ_HANDLED;
diff --git a/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch b/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch
new file mode 100644
index 000000000..65a02bc12
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/801-ag71xx-remove-redundant-napi-functions.patch
@@ -0,0 +1,38 @@
+--- a/drivers/net/ag71xx/ag71xx_main.c
++++ b/drivers/net/ag71xx/ag71xx_main.c
+@@ -575,7 +575,7 @@ static void ag71xx_oom_timer_handler(uns
+ 	struct net_device *dev = (struct net_device *) data;
+ 	struct ag71xx *ag = netdev_priv(dev);
+ 
+-	netif_rx_schedule(&ag->napi);
++	napi_schedule(&ag->napi);
+ }
+ 
+ static void ag71xx_tx_timeout(struct net_device *dev)
+@@ -731,7 +731,7 @@ static int ag71xx_poll(struct napi_struc
+ 		DBG("%s: disable polling mode, done=%d, limit=%d\n",
+ 			dev->name, done, limit);
+ 
+-		netif_rx_complete(napi);
++		napi_complete(napi);
+ 
+ 		/* enable interrupts */
+ 		spin_lock_irqsave(&ag->lock, flags);
+@@ -750,7 +750,7 @@ static int ag71xx_poll(struct napi_struc
+ 		printk(KERN_DEBUG "%s: out of memory\n", dev->name);
+ 
+ 	mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
+-	netif_rx_complete(napi);
++	napi_complete(napi);
+ 	return 0;
+ }
+ 
+@@ -780,7 +780,7 @@ static irqreturn_t ag71xx_interrupt(int 
+ 	if (likely(status & AG71XX_INT_POLL)) {
+ 		ag71xx_int_disable(ag, AG71XX_INT_POLL);
+ 		DBG("%s: enable polling mode\n", dev->name);
+-		netif_rx_schedule(&ag->napi);
++		napi_schedule(&ag->napi);
+ 	}
+ 
+ 	return IRQ_HANDLED;
diff --git a/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch b/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch
new file mode 100644
index 000000000..a692b734a
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/802-ag71xx-use-netdev-ops.patch
@@ -0,0 +1,37 @@
+--- a/drivers/net/ag71xx/ag71xx_main.c
++++ b/drivers/net/ag71xx/ag71xx_main.c
+@@ -791,6 +791,18 @@ static void ag71xx_set_multicast_list(st
+ 	/* TODO */
+ }
+ 
++static const struct net_device_ops ag71xx_netdev_ops = {
++	.ndo_open		= ag71xx_open,
++	.ndo_stop		= ag71xx_stop,
++	.ndo_start_xmit		= ag71xx_hard_start_xmit,
++	.ndo_set_multicast_list	= ag71xx_set_multicast_list,
++	.ndo_do_ioctl		= ag71xx_do_ioctl,
++	.ndo_tx_timeout		= ag71xx_tx_timeout,
++	.ndo_change_mtu		= eth_change_mtu,
++	.ndo_set_mac_address	= eth_mac_addr,
++	.ndo_validate_addr	= eth_validate_addr,
++};
++
+ static int __init ag71xx_probe(struct platform_device *pdev)
+ {
+ 	struct net_device *dev;
+@@ -875,14 +887,9 @@ static int __init ag71xx_probe(struct pl
+ 	}
+ 
+ 	dev->base_addr = (unsigned long)ag->mac_base;
+-	dev->open = ag71xx_open;
+-	dev->stop = ag71xx_stop;
+-	dev->hard_start_xmit = ag71xx_hard_start_xmit;
+-	dev->set_multicast_list = ag71xx_set_multicast_list;
+-	dev->do_ioctl = ag71xx_do_ioctl;
++	dev->netdev_ops = &ag71xx_netdev_ops;
+ 	dev->ethtool_ops = &ag71xx_ethtool_ops;
+ 
+-	dev->tx_timeout = ag71xx_tx_timeout;
+ 	INIT_WORK(&ag->restart_work, ag71xx_restart_work_func);
+ 
+ 	init_timer(&ag->oom_timer);
diff --git a/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
new file mode 100644
index 000000000..d96a874ba
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/803-ar71xx-update-dsa-switch-support.patch
@@ -0,0 +1,46 @@
+--- a/arch/mips/ar71xx/devices.c
++++ b/arch/mips/ar71xx/devices.c
+@@ -792,6 +792,8 @@ static struct platform_device ar71xx_dsa
+ void __init ar71xx_add_device_dsa(unsigned int id,
+ 				  struct dsa_platform_data *d)
+ {
++	int i;
++
+ 	switch (id) {
+ 	case 0:
+ 		d->netdev = &ar71xx_eth0_device.dev;
+@@ -805,7 +807,10 @@ void __init ar71xx_add_device_dsa(unsign
+ 			id);
+ 		return;
+ 	}
+-	d->mii_bus = &ar71xx_mdio_device.dev;
++
++	for (i = 0; i < d->nr_chips; i++)
++		d->chip[i].mii_bus = &ar71xx_mdio_device.dev;
++
+ 	ar71xx_dsa_switch_device.dev.platform_data = d;
+ 
+ 	platform_device_register(&ar71xx_dsa_switch_device);
+--- a/arch/mips/ar71xx/mach-tl-wr941nd.c
++++ b/arch/mips/ar71xx/mach-tl-wr941nd.c
+@@ -104,7 +104,7 @@ static struct gpio_button tl_wr941nd_gpi
+ 	}
+ };
+ 
+-static struct dsa_platform_data tl_wr941nd_dsa_data = {
++static struct dsa_chip_data tl_wr941nd_dsa_chip = {
+ 	.port_names[0]  = "wan",
+ 	.port_names[1]  = "lan1",
+ 	.port_names[2]  = "lan2",
+@@ -113,6 +113,11 @@ static struct dsa_platform_data tl_wr941
+ 	.port_names[5]  = "cpu",
+ };
+ 
++static struct dsa_platform_data tl_wr941nd_dsa_data = {
++	.nr_chips	= 1,
++	.chip		= &tl_wr941nd_dsa_chip,
++};
++
+ static void __init tl_wr941nd_setup(void)
+ {
+ 	u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
diff --git a/target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch b/target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch
new file mode 100644
index 000000000..cf9c405ca
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/901-get_c0_compare_irq_function.patch
@@ -0,0 +1,29 @@
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -48,6 +48,7 @@
+ #include <asm/types.h>
+ #include <asm/stacktrace.h>
+ #include <asm/irq.h>
++#include <asm/time.h>
+ 
+ extern void check_wait(void);
+ extern asmlinkage void r4k_wait(void);
+@@ -1538,6 +1539,8 @@ void __cpuinit per_cpu_trap_init(void)
+ 	 */
+ 	if (cpu_has_mips_r2) {
+ 		cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
++		if (get_c0_compare_irq)
++			cp0_compare_irq = get_c0_compare_irq();
+ 		cp0_perfcount_irq = (read_c0_intctl() >> 26) & 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.31/902-mips_clocksource_init_war.patch b/target/linux/ar71xx/patches-2.6.31/902-mips_clocksource_init_war.patch
new file mode 100644
index 000000000..894eed1e5
--- /dev/null
+++ b/target/linux/ar71xx/patches-2.6.31/902-mips_clocksource_init_war.patch
@@ -0,0 +1,56 @@
+--- a/arch/mips/kernel/cevt-r4k.c
++++ b/arch/mips/kernel/cevt-r4k.c
+@@ -16,6 +16,22 @@
+ #include <asm/cevt-r4k.h>
+ 
+ /*
++ * 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.
++ */
++
++#define compare_change_hazard() \
++	do { \
++		irq_disable_hazard(); \
++		irq_disable_hazard(); \
++		irq_disable_hazard(); \
++		irq_disable_hazard(); \
++	} while (0)
++
++/*
+  * The SMTC Kernel for the 34K, 1004K, et. al. replaces several
+  * of these routines with SMTC-specific variants.
+  */
+@@ -31,6 +47,7 @@ static int mips_next_event(unsigned long
+ 	cnt = read_c0_count();
+ 	cnt += delta;
+ 	write_c0_compare(cnt);
++	compare_change_hazard();
+ 	res = ((int)(read_c0_count() - cnt) > 0) ? -ETIME : 0;
+ 	return res;
+ }
+@@ -100,22 +117,6 @@ static int c0_compare_int_pending(void)
+ 	return (read_c0_cause() >> cp0_compare_irq) & 0x100;
+ }
+ 
+-/*
+- * 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.
+- */
+-
+-#define compare_change_hazard() \
+-	do { \
+-		irq_disable_hazard(); \
+-		irq_disable_hazard(); \
+-		irq_disable_hazard(); \
+-		irq_disable_hazard(); \
+-	} while (0)
+-
+ int c0_compare_int_usable(void)
+ {
+ 	unsigned int delta;