Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 14249 insertions, 4385 deletions

diff --git a/target/linux/patches/2.6.39/rb4xx.patch b/target/linux/patches/2.6.39/rb4xx.patch
index 1739221bf..49fd204d7 100644
--- a/target/linux/patches/2.6.39/rb4xx.patch
+++ b/target/linux/patches/2.6.39/rb4xx.patch
@@ -1,385 +1,7 @@
-diff -Nur linux-2.6.39.orig/arch/mips/Kconfig linux-2.6.39/arch/mips/Kconfig
---- linux-2.6.39.orig/arch/mips/Kconfig	2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/mips/Kconfig	2011-05-27 14:36:50.000000000 +0200
-@@ -84,6 +84,23 @@
- 	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
-@@ -740,6 +757,7 @@
- 
- source "arch/mips/alchemy/Kconfig"
- source "arch/mips/ath79/Kconfig"
-+source "arch/mips/ar71xx/Kconfig"
- source "arch/mips/bcm63xx/Kconfig"
- source "arch/mips/jazz/Kconfig"
- source "arch/mips/jz4740/Kconfig"
-diff -Nur linux-2.6.39.orig/arch/mips/Makefile linux-2.6.39/arch/mips/Makefile
---- linux-2.6.39.orig/arch/mips/Makefile	2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/mips/Makefile	2011-05-27 14:36:50.000000000 +0200
-@@ -158,6 +158,13 @@
- 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,)
-diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/Kconfig linux-2.6.39/arch/mips/ar71xx/Kconfig
---- linux-2.6.39.orig/arch/mips/ar71xx/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/Kconfig	2011-05-27 14:36:50.000000000 +0200
-@@ -0,0 +1,264 @@
-+if ATHEROS_AR71XX
-+
-+menu "Atheros AR71xx machine selection"
-+
-+config AR71XX_MACH_AP81
-+	bool "Atheros AP81 board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_AP83
-+	bool "Atheros AP83 board support"
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_DIR_600_A1
-+	bool "D-Link DIR-600 rev. A1 support"
-+	select AR71XX_DEV_AP91_ETH
-+	select AR71XX_DEV_AP91_PCI if PCI
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_NVRAM
-+	default n
-+
-+config AR71XX_MACH_DIR_615_C1
-+	bool "D-Link DIR-615 rev. C1 support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_NVRAM
-+	default n
-+
-+config AR71XX_MACH_DIR_825_B1
-+	bool "D-Link DIR-825 rev. B1 board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AP94_PCI if PCI
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_PB42
-+	bool "Atheros PB42 board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_PB42_PCI if PCI
-+	default n
-+
-+config AR71XX_MACH_PB44
-+	bool "Atheros PB44 board support"
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_PB42_PCI if PCI
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_PB92
-+	bool "Atheros PB92 board support"
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_PB9X_PCI if PCI
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_AW_NR580
-+	bool "AzureWave AW-NR580 board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_PB42_PCI if PCI
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+
-+config AR71XX_MACH_WZR_HP_G300NH
-+	bool "Buffalo WZR-HP-G300NH board support"
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default y
-+
-+config AR71XX_MACH_WP543
-+	bool "Compex WP543/WPJ543 board support"
-+	select MYLOADER
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_PB42_PCI if PCI
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_WRT160NL
-+	bool "Linksys WRT160NL board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	select AR71XX_NVRAM
-+	default n
-+
-+config AR71XX_MACH_WRT400N
-+	bool "Linksys WRT400N board support"
-+	select AR71XX_DEV_AP94_PCI if PCI
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+
-+config AR71XX_MACH_RB4XX
-+	bool "MikroTik RouterBOARD 4xx series support"
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_RB750
-+	bool "MikroTik RouterBOARD 750 support"
-+	select AR71XX_DEV_AP91_ETH
-+	default n
-+
-+config AR71XX_MACH_WNDR3700
-+	bool "NETGEAR WNDR3700 board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AP94_PCI if PCI
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_WNR2000
-+	bool "NETGEAR WNR2000 board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+
-+config AR71XX_MACH_MZK_W04NU
-+	bool "Planex MZK-W04NU board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_MZK_W300NH
-+	bool "Planex MZK-W300NH board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+
-+config AR71XX_MACH_NBG460N
-+	bool "Zyxel NBG460N/550N/550NH board support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+	
-+config AR71XX_MACH_TL_WR741ND
-+	bool "TP-LINK TL-WR741ND support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AP91_ETH
-+	select AR71XX_DEV_AP91_PCI if PCI
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+
-+config AR71XX_MACH_TL_WR841N_V1
-+	bool "TP-LINK TL-WR841N v1 support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_PB42_PCI if PCI
-+	select AR71XX_DEV_DSA
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+
-+config AR71XX_MACH_TL_WR941ND
-+	bool "TP-LINK TL-WR941ND support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_DSA
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	default n
-+
-+config AR71XX_MACH_TL_WR1043ND
-+	bool "TP-LINK TL-WR1043ND support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_USB
-+	default n
-+
-+config AR71XX_MACH_TEW_632BRP
-+	bool "TRENDnet TEW-632BRP support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AR913X_WMAC
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_NVRAM
-+	default n
-+
-+config AR71XX_MACH_UBNT
-+	bool "Ubiquiti AR71xx based boards support"
-+	select AR71XX_DEV_M25P80
-+	select AR71XX_DEV_AP91_PCI if PCI
-+	select AR71XX_DEV_GPIO_BUTTONS
-+	select AR71XX_DEV_LEDS_GPIO
-+	select AR71XX_DEV_PB42_PCI if PCI
-+	select AR71XX_DEV_USB
-+	default n
-+
-+endmenu
-+
-+config AR71XX_DEV_M25P80
-+	def_bool n
-+
-+config AR71XX_DEV_AP91_PCI
-+	def_bool n
-+
-+config AR71XX_DEV_AP91_ETH
-+	def_bool n
-+
-+config AR71XX_DEV_AP94_PCI
-+	def_bool n
-+
-+config AR71XX_DEV_AR913X_WMAC
-+	def_bool n
-+
-+config AR71XX_DEV_DSA
-+	def_bool n
-+
-+config AR71XX_DEV_GPIO_BUTTONS
-+	def_bool n
-+
-+config AR71XX_DEV_LEDS_GPIO
-+	def_bool n
-+
-+config AR71XX_DEV_PB42_PCI
-+	def_bool n
-+
-+config AR71XX_DEV_PB9X_PCI
-+	def_bool n
-+
-+config AR71XX_DEV_USB
-+	def_bool n
-+
-+config AR71XX_NVRAM
-+	def_bool n
-+
-+endif
-diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/Makefile linux-2.6.39/arch/mips/ar71xx/Makefile
---- linux-2.6.39.orig/arch/mips/ar71xx/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/Makefile	2011-05-27 14:36:50.000000000 +0200
-@@ -0,0 +1,54 @@
-+#
-+# Makefile for the Atheros AR71xx SoC specific parts of the kernel
-+#
-+# Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
-+# Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
-+#
-+# This program is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU General Public License version 2 as published
-+# by the Free Software Foundation.
-+
-+obj-y	:= prom.o irq.o setup.o devices.o gpio.o ar71xx.o
-+
-+obj-$(CONFIG_EARLY_PRINTK)		+= early_printk.o
-+obj-$(CONFIG_PCI)			+= pci.o
-+
-+obj-$(CONFIG_AR71XX_DEV_AP91_ETH)	+= dev-ap91-eth.o
-+obj-$(CONFIG_AR71XX_DEV_AP91_PCI)	+= dev-ap91-pci.o
-+obj-$(CONFIG_AR71XX_DEV_AP94_PCI)	+= dev-ap94-pci.o
-+obj-$(CONFIG_AR71XX_DEV_AR913X_WMAC)	+= dev-ar913x-wmac.o
-+obj-$(CONFIG_AR71XX_DEV_DSA)		+= dev-dsa.o
-+obj-$(CONFIG_AR71XX_DEV_GPIO_BUTTONS)	+= dev-gpio-buttons.o
-+obj-$(CONFIG_AR71XX_DEV_LEDS_GPIO)	+= dev-leds-gpio.o
-+obj-$(CONFIG_AR71XX_DEV_M25P80)		+= dev-m25p80.o
-+obj-$(CONFIG_AR71XX_DEV_PB42_PCI)	+= dev-pb42-pci.o
-+obj-$(CONFIG_AR71XX_DEV_PB9X_PCI)	+= dev-pb9x-pci.o
-+obj-$(CONFIG_AR71XX_DEV_USB)		+= dev-usb.o
-+
-+obj-$(CONFIG_AR71XX_NVRAM)		+= nvram.o
-+
-+obj-$(CONFIG_AR71XX_MACH_AP81)		+= mach-ap81.o
-+obj-$(CONFIG_AR71XX_MACH_AP83)		+= mach-ap83.o
-+obj-$(CONFIG_AR71XX_MACH_AW_NR580)	+= mach-aw-nr580.o
-+obj-$(CONFIG_AR71XX_MACH_DIR_600_A1)	+= mach-dir-600-a1.o
-+obj-$(CONFIG_AR71XX_MACH_DIR_615_C1)	+= mach-dir-615-c1.o
-+obj-$(CONFIG_AR71XX_MACH_DIR_825_B1)	+= mach-dir-825-b1.o
-+obj-$(CONFIG_AR71XX_MACH_MZK_W04NU)	+= mach-mzk-w04nu.o
-+obj-$(CONFIG_AR71XX_MACH_MZK_W300NH)	+= mach-mzk-w300nh.o
-+obj-$(CONFIG_AR71XX_MACH_NBG460N)	+= mach-nbg460n.o
-+obj-$(CONFIG_AR71XX_MACH_PB42)		+= mach-pb42.o
-+obj-$(CONFIG_AR71XX_MACH_PB44)		+= mach-pb44.o
-+obj-$(CONFIG_AR71XX_MACH_PB92)		+= mach-pb92.o
-+obj-$(CONFIG_AR71XX_MACH_RB4XX)		+= mach-rb4xx.o
-+obj-$(CONFIG_AR71XX_MACH_RB750)		+= mach-rb750.o
-+obj-$(CONFIG_AR71XX_MACH_TEW_632BRP)	+= mach-tew-632brp.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR741ND)	+= mach-tl-wr741nd.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR841N_V1)	+= mach-tl-wr841n.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR941ND)	+= mach-tl-wr941nd.o
-+obj-$(CONFIG_AR71XX_MACH_TL_WR1043ND)	+= mach-tl-wr1043nd.o
-+obj-$(CONFIG_AR71XX_MACH_UBNT)		+= mach-ubnt.o
-+obj-$(CONFIG_AR71XX_MACH_WNDR3700)	+= mach-wndr3700.o
-+obj-$(CONFIG_AR71XX_MACH_WNR2000)	+= mach-wnr2000.o
-+obj-$(CONFIG_AR71XX_MACH_WP543)		+= mach-wp543.o
-+obj-$(CONFIG_AR71XX_MACH_WRT160NL)	+= mach-wrt160nl.o
-+obj-$(CONFIG_AR71XX_MACH_WRT400N)	+= mach-wrt400n.o
 diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.39/arch/mips/ar71xx/ar71xx.c
 --- linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/ar71xx.c	2011-05-27 14:36:50.000000000 +0200
-@@ -0,0 +1,177 @@
++++ linux-2.6.39/arch/mips/ar71xx/ar71xx.c	2011-08-24 02:41:55.227990426 +0200
+@@ -0,0 +1,230 @@
 +/*
 + *  AR71xx SoC routines
 + *
@@ -395,10 +17,12 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.39/arch/mips/ar7
 +#include <linux/module.h>
 +#include <linux/types.h>
 +#include <linux/mutex.h>
++#include <linux/spinlock.h>
 +
 +#include <asm/mach-ar71xx/ar71xx.h>
 +
 +static DEFINE_MUTEX(ar71xx_flash_mutex);
++static DEFINE_SPINLOCK(ar71xx_device_lock);
 +
 +void __iomem *ar71xx_ddr_base;
 +EXPORT_SYMBOL_GPL(ar71xx_ddr_base);
@@ -425,30 +49,47 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.39/arch/mips/ar7
 +	case AR71XX_SOC_AR7130:
 +	case AR71XX_SOC_AR7141:
 +	case AR71XX_SOC_AR7161:
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR71XX_RESET_REG_RESET_MODULE);
 +		ar71xx_reset_wr(AR71XX_RESET_REG_RESET_MODULE, t | mask);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	case AR71XX_SOC_AR7240:
 +	case AR71XX_SOC_AR7241:
 +	case AR71XX_SOC_AR7242:
 +		mask_inv = mask & RESET_MODULE_USB_OHCI_DLL_7240;
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR724X_RESET_REG_RESET_MODULE);
 +		t |= mask;
 +		t &= ~mask_inv;
 +		ar71xx_reset_wr(AR724X_RESET_REG_RESET_MODULE, t);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	case AR71XX_SOC_AR9130:
 +	case AR71XX_SOC_AR9132:
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR91XX_RESET_REG_RESET_MODULE);
 +		ar71xx_reset_wr(AR91XX_RESET_REG_RESET_MODULE, t | mask);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
++		break;
++
++	case AR71XX_SOC_AR9330:
++	case AR71XX_SOC_AR9331:
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
++		t = ar71xx_reset_rr(AR933X_RESET_REG_RESET_MODULE);
++		ar71xx_reset_wr(AR933X_RESET_REG_RESET_MODULE, t | mask);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
++		break;
++
++	case AR71XX_SOC_AR9341:
++	case AR71XX_SOC_AR9342:
++	case AR71XX_SOC_AR9344:
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
++		t = ar71xx_reset_rr(AR934X_RESET_REG_RESET_MODULE);
++		ar71xx_reset_wr(AR934X_RESET_REG_RESET_MODULE, t | mask);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	default:
@@ -467,30 +108,47 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.39/arch/mips/ar7
 +	case AR71XX_SOC_AR7130:
 +	case AR71XX_SOC_AR7141:
 +	case AR71XX_SOC_AR7161:
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR71XX_RESET_REG_RESET_MODULE);
 +		ar71xx_reset_wr(AR71XX_RESET_REG_RESET_MODULE, t & ~mask);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	case AR71XX_SOC_AR7240:
 +	case AR71XX_SOC_AR7241:
 +	case AR71XX_SOC_AR7242:
 +		mask_inv = mask & RESET_MODULE_USB_OHCI_DLL_7240;
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR724X_RESET_REG_RESET_MODULE);
 +		t &= ~mask;
 +		t |= mask_inv;
 +		ar71xx_reset_wr(AR724X_RESET_REG_RESET_MODULE, t);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	case AR71XX_SOC_AR9130:
 +	case AR71XX_SOC_AR9132:
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR91XX_RESET_REG_RESET_MODULE);
 +		ar71xx_reset_wr(AR91XX_RESET_REG_RESET_MODULE, t & ~mask);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
++		break;
++
++	case AR71XX_SOC_AR9330:
++	case AR71XX_SOC_AR9331:
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
++		t = ar71xx_reset_rr(AR933X_RESET_REG_RESET_MODULE);
++		ar71xx_reset_wr(AR933X_RESET_REG_RESET_MODULE, t & ~mask);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
++		break;
++
++	case AR71XX_SOC_AR9341:
++	case AR71XX_SOC_AR9342:
++	case AR71XX_SOC_AR9344:
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
++		t = ar71xx_reset_rr(AR934X_RESET_REG_RESET_MODULE);
++		ar71xx_reset_wr(AR934X_RESET_REG_RESET_MODULE, t & ~mask);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	default:
@@ -508,24 +166,39 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.39/arch/mips/ar7
 +	case AR71XX_SOC_AR7130:
 +	case AR71XX_SOC_AR7141:
 +	case AR71XX_SOC_AR7161:
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR71XX_RESET_REG_RESET_MODULE);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	case AR71XX_SOC_AR7240:
 +	case AR71XX_SOC_AR7241:
 +	case AR71XX_SOC_AR7242:
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR724X_RESET_REG_RESET_MODULE);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	case AR71XX_SOC_AR9130:
 +	case AR71XX_SOC_AR9132:
-+		local_irq_save(flags);
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
 +		t = ar71xx_reset_rr(AR91XX_RESET_REG_RESET_MODULE);
-+		local_irq_restore(flags);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
++		break;
++
++	case AR71XX_SOC_AR9330:
++	case AR71XX_SOC_AR9331:
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
++		t = ar71xx_reset_rr(AR933X_RESET_REG_RESET_MODULE);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
++		break;
++
++	case AR71XX_SOC_AR9341:
++	case AR71XX_SOC_AR9342:
++	case AR71XX_SOC_AR9344:
++		spin_lock_irqsave(&ar71xx_device_lock, flags);
++		t = ar71xx_reset_rr(AR934X_RESET_REG_RESET_MODULE);
++		spin_unlock_irqrestore(&ar71xx_device_lock, flags);
 +		break;
 +
 +	default:
@@ -539,10 +212,12 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.39/arch/mips/ar7
 +void ar71xx_ddr_flush(u32 reg)
 +{
 +	ar71xx_ddr_wr(reg, 1);
-+	while ((ar71xx_ddr_rr(reg) & 0x1));
++	while ((ar71xx_ddr_rr(reg) & 0x1))
++		;
 +
 +	ar71xx_ddr_wr(reg, 1);
-+	while ((ar71xx_ddr_rr(reg) & 0x1));
++	while ((ar71xx_ddr_rr(reg) & 0x1))
++		;
 +}
 +EXPORT_SYMBOL_GPL(ar71xx_ddr_flush);
 +
@@ -557,111 +232,10 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/ar71xx.c linux-2.6.39/arch/mips/ar7
 +	mutex_unlock(&ar71xx_flash_mutex);
 +}
 +EXPORT_SYMBOL_GPL(ar71xx_flash_release);
-diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-eth.c linux-2.6.39/arch/mips/ar71xx/dev-ap91-eth.c
---- linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-eth.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/dev-ap91-eth.c	2011-05-27 14:36:50.000000000 +0200
-@@ -0,0 +1,70 @@
-+/*
-+ *  Atheros AP91 reference board ethernet initialization
-+ *
-+ *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ */
-+
-+#include "devices.h"
-+#include "dev-dsa.h"
-+#include "dev-ap91-eth.h"
-+
-+static struct dsa_chip_data ap91_dsa_chip = {
-+	.port_names[0]  = "cpu",
-+	.port_names[1]  = "lan1",
-+	.port_names[2]  = "lan2",
-+	.port_names[3]  = "lan3",
-+	.port_names[4]  = "lan4",
-+};
-+
-+static struct dsa_platform_data ap91_dsa_data = {
-+	.nr_chips	= 1,
-+	.chip		= &ap91_dsa_chip,
-+};
-+
-+static void ap91_eth_set_port_name(unsigned port, const char *name)
-+{
-+	if (port < 1 || port > 5)
-+		return;
-+
-+	if (name)
-+		ap91_dsa_chip.port_names[port] = (char *) name;
-+}
-+
-+void __init ap91_eth_init(u8 *mac_addr, const char *port_names[])
-+{
-+	if (mac_addr)
-+		ar71xx_set_mac_base(mac_addr);
-+
-+	if (port_names) {
-+		int i;
-+
-+		for (i = 0; i < AP91_ETH_NUM_PORT_NAMES; i++)
-+			ap91_eth_set_port_name(i + 1, port_names[i]);
-+	}
-+
-+	/* WAN port */
-+	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-+	ar71xx_eth0_data.speed = SPEED_100;
-+	ar71xx_eth0_data.duplex = DUPLEX_FULL;
-+	ar71xx_eth0_data.fifo_cfg1 = 0x0fff0000;
-+	ar71xx_eth0_data.fifo_cfg2 = 0x00001fff;
-+	ar71xx_eth0_data.fifo_cfg3 = 0x008001ff;
-+
-+	/* LAN ports */
-+	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-+	ar71xx_eth1_data.speed = SPEED_1000;
-+	ar71xx_eth1_data.duplex = DUPLEX_FULL;
-+	ar71xx_eth1_data.fifo_cfg1 = 0x0fff0000;
-+	ar71xx_eth1_data.fifo_cfg2 = 0x00001fff;
-+	ar71xx_eth1_data.fifo_cfg3 = 0x008001ff;
-+
-+	ar71xx_add_device_mdio(0x0);
-+	ar71xx_add_device_eth(1);
-+	ar71xx_add_device_eth(0);
-+
-+	ar71xx_add_device_dsa(1, &ap91_dsa_data);
-+}
-diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-eth.h linux-2.6.39/arch/mips/ar71xx/dev-ap91-eth.h
---- linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-eth.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/dev-ap91-eth.h	2011-05-27 14:36:50.000000000 +0200
-@@ -0,0 +1,23 @@
-+/*
-+ *  Atheros AP91 reference board ethernet initialization
-+ *
-+ *  Copyright (C) 2010 Gabor Juhos <juhosg@openwrt.org>
-+ *
-+ *  This program is free software; you can redistribute it and/or modify it
-+ *  under the terms of the GNU General Public License version 2 as published
-+ *  by the Free Software Foundation.
-+ */
-+
-+#ifndef _AR71XX_DEV_AP91_ETH_H
-+#define _AR71XX_DEV_AP91_ETH_H
-+
-+#define AP91_ETH_NUM_PORT_NAMES	4
-+
-+#if defined(CONFIG_AR71XX_DEV_AP91_ETH)
-+void ap91_eth_init(u8 *mac_addr, const char *port_names[]) __init;
-+#else
-+static inline void ap91_eth_init(u8 *mac_addr) { }
-+#endif
-+
-+#endif /* _AR71XX_DEV_AP91_ETH_H */
-+
 diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.39/arch/mips/ar71xx/dev-ap91-pci.c
 --- linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/dev-ap91-pci.c	2011-05-27 14:36:50.000000000 +0200
-@@ -0,0 +1,114 @@
++++ linux-2.6.39/arch/mips/ar71xx/dev-ap91-pci.c	2011-08-24 02:41:55.277990824 +0200
+@@ -0,0 +1,71 @@
 +/*
 + *  Atheros AP91 reference board PCI initialization
 + *
@@ -680,10 +254,12 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.39/arch/mi
 +#include <asm/mach-ar71xx/pci.h>
 +
 +#include "dev-ap91-pci.h"
++#include "pci-ath9k-fixup.h"
 +
-+static struct ath9k_platform_data ap91_wmac_data;
++static struct ath9k_platform_data ap91_wmac_data = {
++	.led_pin = -1,
++};
 +static char ap91_wmac_mac[6];
-+static int ap91_pci_fixup_enabled;
 +
 +static struct ar71xx_pci_irq ap91_pci_irqs[] __initdata = {
 +	{
@@ -695,7 +271,7 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.39/arch/mi
 +
 +static int ap91_pci_plat_dev_init(struct pci_dev *dev)
 +{
-+	switch(PCI_SLOT(dev->devfn)) {
++	switch (PCI_SLOT(dev->devfn)) {
 +	case 0:
 +		dev->dev.platform_data = &ap91_wmac_data;
 +		break;
@@ -704,61 +280,16 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.39/arch/mi
 +	return 0;
 +}
 +
-+static void ap91_pci_fixup(struct pci_dev *dev)
++__init void ap91_pci_setup_wmac_led_pin(int pin)
 +{
-+	void __iomem *mem;
-+	u16 *cal_data;
-+	u16 cmd;
-+	u32 val;
-+
-+	if (!ap91_pci_fixup_enabled)
-+		return;
-+
-+	printk(KERN_INFO "PCI: fixup device %s\n", pci_name(dev));
-+
-+	cal_data = ap91_wmac_data.eeprom_data;
-+	if (*cal_data != 0xa55a) {
-+		printk(KERN_ERR "PCI: no calibration data found for %s\n",
-+		       pci_name(dev));
-+		return;
-+	}
-+
-+	mem = ioremap(AR71XX_PCI_MEM_BASE, 0x10000);
-+	if (!mem) {
-+		printk(KERN_ERR "PCI: ioremap error for device %s\n",
-+		       pci_name(dev));
-+		return;
-+	}
-+
-+	/* Setup the PCI device to allow access to the internal registers */
-+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, 0xffff);
-+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-+	cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
-+	pci_write_config_word(dev, PCI_COMMAND, cmd);
-+
-+        /* set pointer to first reg address */
-+	cal_data += 3;
-+	while (*cal_data != 0xffff) {
-+		u32 reg;
-+		reg = *cal_data++;
-+		val = *cal_data++;
-+		val |= (*cal_data++) << 16;
-+
-+		__raw_writel(val, mem + reg);
-+		udelay(100);
-+	}
-+
-+	pci_read_config_dword(dev, PCI_VENDOR_ID, &val);
-+	dev->vendor = val & 0xffff;
-+	dev->device = (val >> 16) & 0xffff;
-+
-+	pci_read_config_dword(dev, PCI_CLASS_REVISION, &val);
-+	dev->revision = val & 0xff;
-+	dev->class = val >> 8; /* upper 3 bytes */
++	ap91_wmac_data.led_pin = pin;
++}
 +
-+	iounmap(mem);
++__init void ap91_pci_setup_wmac_gpio(u32 mask, u32 val)
++{
++	ap91_wmac_data.gpio_mask = mask;
++	ap91_wmac_data.gpio_val = val;
 +}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ap91_pci_fixup);
 +
 +void __init ap91_pci_init(u8 *cal_data, u8 *mac_addr)
 +{
@@ -774,12 +305,12 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.c linux-2.6.39/arch/mi
 +	ar71xx_pci_plat_dev_init = ap91_pci_plat_dev_init;
 +	ar71xx_pci_init(ARRAY_SIZE(ap91_pci_irqs), ap91_pci_irqs);
 +
-+	ap91_pci_fixup_enabled = 1;
++	pci_enable_ath9k_fixup(0, ap91_wmac_data.eeprom_data);
 +}
 diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.39/arch/mips/ar71xx/dev-ap91-pci.h
 --- linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/dev-ap91-pci.h	2011-05-27 14:36:50.000000000 +0200
-@@ -0,0 +1,21 @@
++++ linux-2.6.39/arch/mips/ar71xx/dev-ap91-pci.h	2011-08-24 02:41:55.287981779 +0200
+@@ -0,0 +1,25 @@
 +/*
 + *  Atheros AP91 reference board PCI initialization
 + *
@@ -795,16 +326,20 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap91-pci.h linux-2.6.39/arch/mi
 +
 +#if defined(CONFIG_AR71XX_DEV_AP91_PCI)
 +void ap91_pci_init(u8 *cal_data, u8 *mac_addr) __init;
++void ap91_pci_setup_wmac_led_pin(int pin) __init;
++void ap91_pci_setup_wmac_gpio(u32 mask, u32 val) __init;
 +#else
 +static inline void ap91_pci_init(u8 *cal_data, u8 *mac_addr) { }
++static inline void ap91_pci_setup_wmac_led_pin(int pin) { }
++static inline void ap91_pci_setup_wmac_gpio(u32 mask, u32 gpio) { }
 +#endif
 +
 +#endif /* _AR71XX_DEV_AP91_PCI_H */
 +
 diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.39/arch/mips/ar71xx/dev-ap94-pci.c
 --- linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/dev-ap94-pci.c	2011-05-27 14:36:51.000000000 +0200
-@@ -0,0 +1,159 @@
++++ linux-2.6.39/arch/mips/ar71xx/dev-ap94-pci.c	2011-08-24 02:41:55.287981779 +0200
+@@ -0,0 +1,109 @@
 +/*
 + *  Atheros AP94 reference board PCI initialization
 + *
@@ -823,28 +358,32 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.39/arch/mi
 +#include <asm/mach-ar71xx/pci.h>
 +
 +#include "dev-ap94-pci.h"
++#include "pci-ath9k-fixup.h"
 +
-+static struct ath9k_platform_data ap94_wmac0_data;
-+static struct ath9k_platform_data ap94_wmac1_data;
++static struct ath9k_platform_data ap94_wmac0_data = {
++	.led_pin = -1,
++};
++static struct ath9k_platform_data ap94_wmac1_data = {
++	.led_pin = -1,
++};
 +static char ap94_wmac0_mac[6];
 +static char ap94_wmac1_mac[6];
-+static int ap94_pci_fixup_enabled;
 +
 +static struct ar71xx_pci_irq ap94_pci_irqs[] __initdata = {
-+        {
-+                .slot   = 0,
-+                .pin    = 1,
-+                .irq    = AR71XX_PCI_IRQ_DEV0,
-+        }, {
-+                .slot   = 1,
-+                .pin    = 1,
-+                .irq    = AR71XX_PCI_IRQ_DEV1,
-+        }
++	{
++		.slot   = 0,
++		.pin    = 1,
++		.irq    = AR71XX_PCI_IRQ_DEV0,
++	}, {
++		.slot   = 1,
++		.pin    = 1,
++		.irq    = AR71XX_PCI_IRQ_DEV1,
++	}
 +};
 +
 +static int ap94_pci_plat_dev_init(struct pci_dev *dev)
 +{
-+	switch(PCI_SLOT(dev->devfn)) {
++	switch (PCI_SLOT(dev->devfn)) {
 +	case 17:
 +		dev->dev.platform_data = &ap94_wmac0_data;
 +		break;
@@ -857,85 +396,30 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.39/arch/mi
 +	return 0;
 +}
 +
-+static void ap94_pci_fixup(struct pci_dev *dev)
++__init void ap94_pci_setup_wmac_led_pin(unsigned wmac, int pin)
 +{
-+	void __iomem *mem;
-+	u16 *cal_data;
-+	u16 cmd;
-+	u32 bar0;
-+	u32 val;
-+
-+	if (!ap94_pci_fixup_enabled)
-+		return;
-+
-+	switch (PCI_SLOT(dev->devfn)) {
-+	case 17:
-+		cal_data = ap94_wmac0_data.eeprom_data;
++	switch (wmac) {
++	case 0:
++		ap94_wmac0_data.led_pin = pin;
 +		break;
-+	case 18:
-+		cal_data = ap94_wmac1_data.eeprom_data;
++	case 1:
++		ap94_wmac1_data.led_pin = pin;
 +		break;
-+	default:
-+		return;
-+	}
-+
-+	if (*cal_data != 0xa55a) {
-+		printk(KERN_ERR "PCI: no calibration data found for %s\n",
-+		       pci_name(dev));
-+		return;
-+	}
-+
-+	mem = ioremap(AR71XX_PCI_MEM_BASE, 0x10000);
-+	if (!mem) {
-+		printk(KERN_ERR "PCI: ioremap error for device %s\n",
-+		       pci_name(dev));
-+		return;
 +	}
-+
-+	printk(KERN_INFO "PCI: fixup device %s\n", pci_name(dev));
-+
-+	pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &bar0);
-+
-+	/* Setup the PCI device to allow access to the internal registers */
-+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, AR71XX_PCI_MEM_BASE);
-+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-+	cmd |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY;
-+	pci_write_config_word(dev, PCI_COMMAND, cmd);
-+
-+	/* set pointer to first reg address */
-+	cal_data += 3;
-+	while (*cal_data != 0xffff) {
-+		u32 reg;
-+		reg = *cal_data++;
-+		val = *cal_data++;
-+		val |= (*cal_data++) << 16;
-+
-+		__raw_writel(val, mem + reg);
-+		udelay(100);
-+	}
-+
-+	pci_read_config_dword(dev, PCI_VENDOR_ID, &val);
-+	dev->vendor = val & 0xffff;
-+	dev->device = (val >> 16) & 0xffff;
-+
-+	pci_read_config_dword(dev, PCI_CLASS_REVISION, &val);
-+	dev->revision = val & 0xff;
-+	dev->class = val >> 8; /* upper 3 bytes */
-+
-+	pci_read_config_word(dev, PCI_COMMAND, &cmd);
-+	cmd &= ~(PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY);
-+	pci_write_config_word(dev, PCI_COMMAND, cmd);
-+
-+	pci_write_config_dword(dev, PCI_BASE_ADDRESS_0, bar0);
-+
-+	iounmap(mem);
 +}
-+DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_ATHEROS, PCI_ANY_ID, ap94_pci_fixup);
 +
-+void __init ap94_pci_enable_quirk_wndr3700(void)
++__init void ap94_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val)
 +{
-+	ap94_wmac0_data.quirk_wndr3700 = 1;
-+	ap94_wmac1_data.quirk_wndr3700 = 1;
++	switch (wmac) {
++	case 0:
++		ap94_wmac0_data.gpio_mask = mask;
++		ap94_wmac0_data.gpio_val = val;
++		break;
++	case 1:
++		ap94_wmac1_data.gpio_mask = mask;
++		ap94_wmac1_data.gpio_val = val;
++		break;
++	}
 +}
 +
 +void __init ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
@@ -962,12 +446,13 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.c linux-2.6.39/arch/mi
 +	ar71xx_pci_plat_dev_init = ap94_pci_plat_dev_init;
 +	ar71xx_pci_init(ARRAY_SIZE(ap94_pci_irqs), ap94_pci_irqs);
 +
-+	ap94_pci_fixup_enabled = 1;
++	pci_enable_ath9k_fixup(17, ap94_wmac0_data.eeprom_data);
++	pci_enable_ath9k_fixup(18, ap94_wmac1_data.eeprom_data);
 +}
 diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.39/arch/mips/ar71xx/dev-ap94-pci.h
 --- linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/dev-ap94-pci.h	2011-05-27 14:36:51.000000000 +0200
-@@ -0,0 +1,28 @@
++++ linux-2.6.39/arch/mips/ar71xx/dev-ap94-pci.h	2011-08-24 02:41:55.287981779 +0200
+@@ -0,0 +1,31 @@
 +/*
 + *  Atheros AP94 reference board PCI initialization
 + *
@@ -985,28 +470,32 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ap94-pci.h linux-2.6.39/arch/mi
 +void ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
 +		   u8 *cal_data1, u8 *mac_addr1) __init;
 +
-+void ap94_pci_enable_quirk_wndr3700(void) __init;
++void ap94_pci_setup_wmac_led_pin(unsigned wmac, int pin) __init;
++void ap94_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val) __init;
 +
 +#else
 +static inline void ap94_pci_init(u8 *cal_data0, u8 *mac_addr0,
 +				 u8 *cal_data1, u8 *mac_addr1) {}
 +
-+static inline void ap94_pci_enable_quirk_wndr3700(void) {}
++static inline void ap94_pci_setup_wmac_led_pin(unsigned wmac, int pin) {}
++static inline void ap94_pci_setup_wmac_gpio(unsigned wmac,
++					    u32 mask, u32 val) {}
 +#endif
 +
 +#endif /* _AR71XX_DEV_AP94_PCI_H */
 +
-diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.39/arch/mips/ar71xx/dev-ar913x-wmac.c
---- linux-2.6.39.orig/arch/mips/ar71xx/dev-ar913x-wmac.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.39/arch/mips/ar71xx/dev-ar913x-wmac.c	2011-05-27 14:36:51.000000000 +0200
-@@ -0,0 +1,68 @@
+diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ar9xxx-wmac.c linux-2.6.39/arch/mips/ar71xx/dev-ar9xxx-wmac.c
+--- linux-2.6.39.orig/arch/mips/ar71xx/dev-ar9xxx-wmac.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.39/arch/mips/ar71xx/dev-ar9xxx-wmac.c	2011-08-24 02:41:55.287981779 +0200
+@@ -0,0 +1,154 @@
 +/*
-+ *  Atheros AR913x SoC built-in WMAC device support
++ *  Atheros AR9XXX SoCs built-in WMAC device support
 + *
++ *  Copyright (C) 2010-2011 Jaiganesh Narayanan <jnarayanan@atheros.com>
 + *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
 + *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
 + *
-+ *  Parts of this file are based on Atheros' 2.6.15 BSP
++ *  Parts of this file are based on Atheros 2.6.15/2.6.31 BSP
 + *
 + *  This program is free software; you can redistribute it and/or modify it
 + *  under the terms of the GNU General Public License version 2 as published
@@ -1022,15 +511,18 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.39/arch
 +
 +#include <asm/mach-ar71xx/ar71xx.h>
 +
-+#include "dev-ar913x-wmac.h"
++#include "dev-ar9xxx-wmac.h"
 +
-+static struct ath9k_platform_data ar913x_wmac_data;
-+static char ar913x_wmac_mac[6];
++#define MHZ_25	(25 * 1000 * 1000)
++
++static struct ath9k_platform_data ar9xxx_wmac_data = {
++	.led_pin = -1,
++};
++static char ar9xxx_wmac_mac[6];
 +
-+static struct resource ar913x_wmac_resources[] = {
++static struct resource ar9xxx_wmac_resources[] = {
 +	{
-+		.start	= AR91XX_WMAC_BASE,
-+		.end	= AR91XX_WMAC_BASE + AR91XX_WMAC_SIZE - 1,
++		/* .start and .end fields are filled dynamically */
 +		.flags	= IORESOURCE_MEM,
 +	}, {
 +		.start	= AR71XX_CPU_IRQ_IP2,
@@ -1039,61 +531,205 @@ diff -Nur linux-2.6.39.orig/arch/mips/ar71xx/dev-ar913x-wmac.c linux-2.6.39/arch
 +	},
 +};
 +
-+static struct platform_device ar913x_wmac_device = {
++static struct platform_device ar9xxx_wmac_device = {
 +	.name		= "ath9k",
 +	.id		= -1,
-+	.resource	= ar913x_wmac_resources,
-+	.num_resources	= ARRAY_SIZE(ar913x_wmac_resources),
++	.res