merge latest mac80211 from trunk (as of r22038) to backfire
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 1 Jul 2010 22:22:39 +0000 (22:22 +0000)
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 1 Jul 2010 22:22:39 +0000 (22:22 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@22039 3c298f89-4303-0410-b956-a3cf2f4a3e73

31 files changed:
package/mac80211/Makefile
package/mac80211/patches/001-disable_b44.patch
package/mac80211/patches/002-disable_rfkill.patch
package/mac80211/patches/005-disable_ssb_build.patch
package/mac80211/patches/007-remove_misc_drivers.patch
package/mac80211/patches/010-no_pcmcia.patch
package/mac80211/patches/011-no_sdio.patch
package/mac80211/patches/013-disable_b43_nphy.patch
package/mac80211/patches/015-remove-rt2x00-options.patch
package/mac80211/patches/020-wext-fix.patch [new file with mode: 0644]
package/mac80211/patches/110-disable_usb_compat.patch
package/mac80211/patches/170-dma_set_coherent_mask.patch [deleted file]
package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch
package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch
package/mac80211/patches/405-ath9k-read-eeprom-data-from-platform-data-on-pci-bus.patch
package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch
package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch
package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch
package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch
package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch
package/mac80211/patches/500-ath9k_use_minstrel.patch
package/mac80211/patches/510-ar9100_tsf_preserve.patch [new file with mode: 0644]
package/mac80211/patches/510-pending_work.patch [deleted file]
package/mac80211/patches/520-ath9k_enable_ar9300.patch [deleted file]
package/mac80211/patches/520-initval_rename.patch [new file with mode: 0644]
package/mac80211/patches/521-initval_format_changes.patch [new file with mode: 0644]
package/mac80211/patches/522-initval_updates.patch [new file with mode: 0644]
package/mac80211/patches/530-ath9k_nf_sanitize.patch [new file with mode: 0644]
package/mac80211/patches/531-ath9k_nf_cleanup.patch [new file with mode: 0644]
package/mac80211/patches/540-ath9k_hang_check.patch [new file with mode: 0644]
package/mac80211/patches/750-set_pci_mwi.patch [new file with mode: 0644]

index 02759e1dcb97aa04849977215f81fe6bb03c3a08..4d2ef0edecb519676849b052d5c96b1db3002e0a 100644 (file)
@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
-PKG_VERSION:=2010-06-10
-PKG_RELEASE:=2
+PKG_VERSION:=2010-06-28
+PKG_RELEASE:=1
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 #      http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \
 #      http://wireless.kernel.org/download/compat-wireless-2.6
-PKG_MD5SUM:=4074469689f7a5a0d2e038f2b5dad0bb
+PKG_MD5SUM:=10100e68991ed0749ee52cfc1704966b
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
@@ -35,7 +35,7 @@ define KernelPackage/mac80211/Default
   SUBMENU:=$(WMENU)
   URL:=http://linuxwireless.org/
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-  DEPENDS:=@LINUX_2_6 @(!(TARGET_avr32||TARGET_ep93xx||TARGET_ps3||TARGET_pxcab)||BROKEN)
+  DEPENDS:=@(!(TARGET_avr32||TARGET_ep93xx||TARGET_ps3||TARGET_pxcab)||BROKEN)
 endef
 
 define KernelPackage/cfg80211
@@ -440,7 +440,26 @@ define Download/usb8388
 endef
 $(eval $(call Download,usb8388))
 
-define KernelPackage/libertas
+SD8686FW_NAME:=sd8686
+SD8686FW_VERSION:=9.70.7.p0
+
+define Download/sd8686
+  URL:=http://dev.laptop.org/pub/firmware/libertas/
+  FILE:=$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin
+  MD5SUM=b4f8be61e19780a14836f146c538c5dd
+endef
+$(eval $(call Download,sd8686))
+
+SD8686HELPER_NAME:=sd8686_helper
+
+define Download/sd8686_helper
+  URL:=http://dev.laptop.org/pub/firmware/libertas/
+  FILE:=$(SD8686HELPER_NAME).bin
+  MD5SUM=2a4d8f4df198ce949c350df5674f4ac6
+endef
+$(eval $(call Download,sd8686_helper))
+
+define KernelPackage/libertas-usb
   $(call KernelPackage/mac80211/Default)
   DEPENDS+= @USB_SUPPORT +kmod-mac80211 +kmod-usb-core +kmod-lib80211
   TITLE:=Marvell 88W8015 Wireless Driver
@@ -450,6 +469,15 @@ define KernelPackage/libertas
   AUTOLOAD:=$(call AutoLoad,27,libertas usb8xxx)
 endef
 
+define KernelPackage/libertas-sd
+  $(call KernelPackage/mac80211/Default)
+  DEPENDS+= +kmod-mac80211 +kmod-lib80211
+  TITLE:=Marvell 88W8686 Wireless Driver
+  FILES:= \
+       $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.$(LINUX_KMOD_SUFFIX) \
+       $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,libertas libertas_sdio)
+endef
 
 define KernelPackage/ar9170
   $(call KernelPackage/mac80211/Default)
@@ -848,11 +876,12 @@ MAKE_OPTS:= \
        CONFIG_MAC80211_HWSIM=$(if $(CONFIG_PACKAGE_kmod-mac80211-hwsim),m) \
        CONFIG_PCMCIA= \
        CONFIG_LIBIPW=$(if $(CONFIG_PACKAGE_kmod-net-libipw),m) \
-       CONFIG_LIBERTAS=$(if $(CONFIG_PACKAGE_kmod-libertas),m) \
+       CONFIG_LIBERTAS=$(if $(CONFIG_PACKAGE_kmod-libertas-sd)$(CONFIG_PACKAGE_kmod-libertas-usb),m) \
        CONFIG_LIBERTAS_CS= \
-       CONFIG_LIBERTAS_SDIO= \
+       CONFIG_LIBERTAS_SPI= \
+       CONFIG_LIBERTAS_SDIO=$(if $(CONFIG_PACKAGE_kmod-libertas-sd),m) \
        CONFIG_LIBERTAS_THINFIRM= \
-       CONFIG_LIBERTAS_USB=$(if $(CONFIG_PACKAGE_kmod-libertas),m) \
+       CONFIG_LIBERTAS_USB=$(if $(CONFIG_PACKAGE_kmod-libertas-usb),m) \
        CONFIG_IPW2100=$(if $(CONFIG_PACKAGE_kmod-net-ipw2100),m) \
        CONFIG_IPW2200=$(if $(CONFIG_PACKAGE_kmod-net-ipw2200),m) \
        CONFIG_NL80211=y \
@@ -924,11 +953,18 @@ define Build/InstallDev
        $(CP) $(PKG_BUILD_DIR)/drivers/net/wireless/ath/*.h $(1)/usr/include/mac80211/ath/
 endef
 
-define KernelPackage/libertas/install
+define KernelPackage/libertas-usb/install
        $(INSTALL_DIR) $(1)/lib/firmware
        $(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin
 endef
 
+define KernelPackage/libertas-sd/install
+       echo "Libertas install: $(CONFIG_PACKAGE_kmod-libertas-sd)"
+       $(INSTALL_DIR) $(1)/lib/firmware
+       $(INSTALL_DATA) $(DL_DIR)/$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin $(1)/lib/firmware/$(SD8686FW_NAME).bin
+       $(INSTALL_DATA) $(DL_DIR)/$(SD8686HELPER_NAME).bin $(1)/lib/firmware/$(SD8686HELPER_NAME).bin
+endef
+
 define KernelPackage/cfg80211/install
        $(INSTALL_DIR) $(1)/lib/wifi
        $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
@@ -1033,7 +1069,8 @@ endif
 endef
 
 $(eval $(call KernelPackage,ath5k))
-$(eval $(call KernelPackage,libertas))
+$(eval $(call KernelPackage,libertas-usb))
+$(eval $(call KernelPackage,libertas-sd))
 $(eval $(call KernelPackage,cfg80211))
 $(eval $(call KernelPackage,mac80211))
 $(eval $(call KernelPackage,p54-common))
index 3182261fd2e0f8b62c8f2874f29295613ac63b87..31976bd648012968b014ccc15f0e689fcf4b08ff 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -257,8 +257,8 @@ endif
+@@ -268,8 +268,8 @@ endif
  
  CONFIG_P54_PCI=m
  
index c8183baae8546a97f9f468e3879ce38efb74ee33..c5d1ccc507c18461bc24540a7fbd6f5c3bdc846f 100644 (file)
@@ -9,7 +9,7 @@
  
  ifeq ($(CONFIG_MAC80211),y)
  $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular")
-@@ -488,8 +488,8 @@ endif
+@@ -495,8 +495,8 @@ endif
  # We need the backported rfkill module on kernel < 2.6.31.
  # In more recent kernel versions use the in kernel rfkill module.
  ifdef CONFIG_COMPAT_KERNEL_31
index 4b01fa3bb493be053e3a5c35065cc38d3e77ebfc..7207d7b84447cfdf3c16479ecf595ed1553bc2e8 100644 (file)
@@ -19,7 +19,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -240,21 +239,6 @@ CONFIG_IPW2200_QOS=y
+@@ -251,21 +250,6 @@ CONFIG_IPW2200_QOS=y
  #
  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface
  
@@ -41,7 +41,7 @@
  CONFIG_P54_PCI=m
  
  # CONFIG_B44=m
-@@ -418,7 +402,6 @@ endif # end of SPI driver list
+@@ -429,7 +413,6 @@ endif # end of SPI driver list
  
  ifneq ($(CONFIG_MMC),)
  
index 4087e7450c9976e20bb508e9f54f384492629df0..1fb8353330d4e2a9b03a15151a3c73942121b65b 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -271,13 +271,13 @@ endif
+@@ -282,13 +282,13 @@ endif
  CONFIG_MWL8K=m
  
  # Ethernet drivers go here
@@ -19,7 +19,7 @@
  endif
  
  CONFIG_HERMES=m
-@@ -331,10 +331,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
+@@ -342,10 +342,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n
  CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n
  CONFIG_USB_NET_COMPAT_CDCETHER=n
  else
index 078b8039ff49d635e2c974d2dd8aa8258e731cf1..0c8072a3ef5f0fe173a5b57e26cdc4895a5af461 100644 (file)
@@ -9,7 +9,7 @@
  else
  include $(KLIB_BUILD)/.config
  endif
-@@ -181,7 +181,7 @@ CONFIG_B43=m
+@@ -192,7 +192,7 @@ CONFIG_B43=m
  CONFIG_B43_HWRNG=y
  CONFIG_B43_PCI_AUTOSELECT=y
  ifneq ($(CONFIG_PCMCIA),)
index d0916e45927fc342209b01cbe1d522d4a92e0c68..3f7fd5a2ca988968b3251dd7883e489430495a56 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -387,7 +387,7 @@ endif # end of SPI driver list
+@@ -398,7 +398,7 @@ endif # end of SPI driver list
  
  ifneq ($(CONFIG_MMC),)
  
@@ -8,4 +8,4 @@
 +# CONFIG_B43_SDIO=y
  CONFIG_WL1251_SDIO=m
  
- ifneq ($(CONFIG_ARM),)
+ ifndef CONFIG_COMPAT_KERNEL_32
index efdfb149a1d646fef9922c4db7882c48accd4f31..f71d3b288c339aec8fef2e4cdb4ba9204e65798d 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -185,7 +185,7 @@ ifneq ($(CONFIG_PCMCIA),)
+@@ -196,7 +196,7 @@ ifneq ($(CONFIG_PCMCIA),)
  endif
  CONFIG_B43_LEDS=y
  CONFIG_B43_PHY_LP=y
index a9176ece5a79f29023f33b6ba6140049396c0aa7..6946948703d602f74e319002737b695ca6c96c10 100644 (file)
@@ -1,6 +1,6 @@
 --- a/config.mk
 +++ b/config.mk
-@@ -233,12 +233,12 @@ CONFIG_RTL8180=m
+@@ -244,12 +244,12 @@ CONFIG_RTL8180=m
  
  CONFIG_ADM8211=m
  
@@ -15,7 +15,7 @@
  # CONFIG_RT2800PCI_RT30XX=y
  # CONFIG_RT2800PCI_RT35XX=y
  # CONFIG_RT2800PCI_SOC=y
-@@ -344,7 +344,7 @@ CONFIG_RT2800USB_RT30XX=y
+@@ -355,7 +355,7 @@ CONFIG_RT2800USB_RT30XX=y
  CONFIG_RT2800USB_RT35XX=y
  CONFIG_RT2800USB_UNKNOWN=y
  endif
diff --git a/package/mac80211/patches/020-wext-fix.patch b/package/mac80211/patches/020-wext-fix.patch
new file mode 100644 (file)
index 0000000..9cbbb43
--- /dev/null
@@ -0,0 +1,15 @@
+--- a/scripts/gen-compat-autoconf.sh
++++ b/scripts/gen-compat-autoconf.sh
+@@ -191,10 +191,8 @@ if [ -f $KLIB_BUILD/Makefile ]; then
+               echo CONFIG_NETDEVICES_MULTIQUEUE >> $MULT_DEP_FILE
+               define_config_multiple_deps CONFIG_MAC80211_QOS y $ALL_DEPS
+               rm -f $MULT_DEP_FILE
+-              # Kernels >= 2.6.32 can disable WEXT :D
+-              if [ $SUBLEVEL -le 32 ]; then
+-                      define_config_dep CONFIG_CFG80211_WEXT 1 CONFIG_WIRELESS_EXT
+-              fi
++              # Up to kernel 2.6.35 we still need the following:
++              define_config_dep CONFIG_CFG80211_WEXT 1 CONFIG_WIRELESS_EXT
+       fi
+ fi
+ echo "#endif /* COMPAT_AUTOCONF_INCLUDED */"
index 2d7394e834f951312a1dca09c2b5e13975ec521a..c60705a531f3c6ac995254be9365d0cf44681d95 100644 (file)
@@ -11,7 +11,7 @@
  {
 --- a/compat/compat-2.6.29.c
 +++ b/compat/compat-2.6.29.c
-@@ -50,7 +50,7 @@ void netdev_attach_ops(struct net_device
+@@ -51,7 +51,7 @@ void netdev_attach_ops(struct net_device
  EXPORT_SYMBOL(netdev_attach_ops);
  
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23))
diff --git a/package/mac80211/patches/170-dma_set_coherent_mask.patch b/package/mac80211/patches/170-dma_set_coherent_mask.patch
deleted file mode 100644 (file)
index 9bafbeb..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3c02b107ec11e14ef21e7a444ad83f0ef1e68f79 Mon Sep 17 00:00:00 2001
-From: Hauke Mehrtens <hauke@hauke-m.de>
-Date: Sun, 13 Jun 2010 20:41:55 +0200
-Subject: [PATCH 1/2] compat: backport dma_set_coherent_mask
-
-
-Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
----
- include/linux/compat-2.6.34.h |    8 ++++++++
- 1 files changed, 8 insertions(+), 0 deletions(-)
-
---- a/include/linux/compat-2.6.34.h
-+++ b/include/linux/compat-2.6.34.h
-@@ -216,6 +216,14 @@ do {                                                      \
- #define dma_unmap_len_set(PTR, LEN_NAME, VAL)    do { } while (0)
- #endif
-+static inline int dma_set_coherent_mask(struct device *dev, u64 mask)
-+{
-+      if (!dma_supported(dev, mask))
-+              return -EIO;
-+      dev->coherent_dma_mask = mask;
-+      return 0;
-+}
-+
- #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,34)) */
- #endif /* LINUX_26_34_COMPAT_H */
index 96c22a0d0df1740cc1fcbcdb28257cb2272c3553..166c133a612318377153b01261acf2015025e9b9 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -119,6 +119,9 @@ static void ath_unregister_led(struct at
+@@ -120,6 +120,9 @@ static void ath_unregister_led(struct at
  
  void ath_deinit_leds(struct ath_softc *sc)
  {
@@ -10,7 +10,7 @@
        ath_unregister_led(&sc->assoc_led);
        sc->sc_flags &= ~SC_OP_LED_ASSOCIATED;
        ath_unregister_led(&sc->tx_led);
-@@ -132,6 +135,9 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -133,6 +136,9 @@ void ath_init_leds(struct ath_softc *sc)
        char *trigger;
        int ret;
  
index 2c6a5670f373af745179377123677ec330d1859e..23631dcaccc5a7aa18a7fbe745684836d114e4b9 100644 (file)
@@ -8,7 +8,7 @@
  #include <asm/unaligned.h>
  
  #include "hw.h"
-@@ -450,8 +451,16 @@ static int ath9k_hw_init_macaddr(struct 
+@@ -451,8 +452,16 @@ static int ath9k_hw_init_macaddr(struct 
                common->macaddr[2 * i] = eeval >> 8;
                common->macaddr[2 * i + 1] = eeval & 0xff;
        }
index 560f8d42ded5358d7e51c584f3ac7ca1d9d7dd50..bbf46a0d22789baf5f2db4d591a853d8a04f80d3 100644 (file)
@@ -8,7 +8,7 @@
  #include "ath9k.h"
  
  static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = {
-@@ -52,21 +53,36 @@ static void ath_pci_read_cachesize(struc
+@@ -53,21 +54,36 @@ static void ath_pci_read_cachesize(struc
  
  static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data)
  {
index 72d3701dc520e71872371eb440bd53861e5dc97c..77d1c7b6e9e806c72672ff5bf1789bf24b2a1a2b 100644 (file)
@@ -10,7 +10,7 @@
  
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -556,6 +556,7 @@ static int ath9k_init_softc(u16 devid, s
+@@ -538,6 +538,7 @@ static int ath9k_init_softc(u16 devid, s
  {
        struct ath_hw *ah = NULL;
        struct ath_common *common;
@@ -18,7 +18,7 @@
        int ret = 0, i;
        int csz = 0;
  
-@@ -567,6 +568,10 @@ static int ath9k_init_softc(u16 devid, s
+@@ -549,6 +550,10 @@ static int ath9k_init_softc(u16 devid, s
        ah->hw_version.subsysid = subsysid;
        sc->sc_ah = ah;
  
@@ -31,7 +31,7 @@
        common->bus_ops = bus_ops;
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -423,10 +423,6 @@ static void ath9k_hw_init_defaults(struc
+@@ -422,10 +422,6 @@ static void ath9k_hw_init_defaults(struc
        ah->hw_version.magic = AR5416_MAGIC;
        ah->hw_version.subvendorid = 0;
  
@@ -40,5 +40,5 @@
 -              ah->ah_flags = AH_USE_EEPROM;
 -
        ah->atim_window = 0;
-       ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE;
-       ah->beacon_interval = 100;
+       ah->sta_id1_defaults =
+               AR_STA_ID1_CRPT_MIC_ENABLE |
index 7a3e717355d1f005c70635db0de0afba364743a9..72f7751fc93512c79924dba9e51909615420ad3c 100644 (file)
@@ -11,7 +11,7 @@
  #include "hw.h"
  #include "hw-ops.h"
  #include "rc.h"
-@@ -435,18 +437,23 @@ static void ath9k_hw_init_defaults(struc
+@@ -436,18 +438,23 @@ static void ath9k_hw_init_defaults(struc
  static int ath9k_hw_init_macaddr(struct ath_hw *ah)
  {
        struct ath_common *common = ath9k_hw_common(ah);
index 180368a1f4c505415655392a196fc150ce098afc..c280f3cf61e477483e1049b6adc5d2a2500ec6e1 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1398,7 +1398,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1407,7 +1407,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
  
        if (ah->config.rx_intr_mitigation) {
                REG_RMW_FIELD(ah, AR_RIMT, AR_RIMT_LAST, 500);
index 1cdd45e4ef5e4c223b8b2a756315b1cb956e3850..ed7d34883162b085cf1808eaacdfe55118e5d817 100644 (file)
@@ -8,7 +8,7 @@
  #include "ath9k.h"
  
  static char *dev_info = "ath9k";
-@@ -571,6 +572,8 @@ static int ath9k_init_softc(u16 devid, s
+@@ -553,6 +554,8 @@ static int ath9k_init_softc(u16 devid, s
        pdata = (struct ath9k_platform_data *) sc->dev->platform_data;
        if (!pdata)
                ah->ah_flags |= AH_USE_EEPROM;
@@ -17,7 +17,7 @@
  
        common = ath9k_hw_common(ah);
        common->ops = &ath9k_common_ops;
-@@ -693,6 +696,24 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -675,6 +678,24 @@ void ath9k_set_hw_capab(struct ath_softc
        SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
  }
  
@@ -42,7 +42,7 @@
  int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
                    const struct ath_bus_ops *bus_ops)
  {
-@@ -711,6 +732,9 @@ int ath9k_init_device(u16 devid, struct 
+@@ -693,6 +714,9 @@ int ath9k_init_device(u16 devid, struct 
        common = ath9k_hw_common(ah);
        ath9k_set_hw_capab(sc, hw);
  
@@ -54,7 +54,7 @@
                              ath9k_reg_notifier);
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -583,6 +583,8 @@ struct ath_softc {
+@@ -594,6 +594,8 @@ struct ath_softc {
  
        int beacon_interval;
  
index eb1d316b584325b8b422a8208fe82e3b8917b01d..2544bbf47253a77f8ac1f32c480430bbe12a126c 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/gpio.c
 +++ b/drivers/net/wireless/ath/ath9k/gpio.c
-@@ -138,7 +138,9 @@ void ath_init_leds(struct ath_softc *sc)
+@@ -139,7 +139,9 @@ void ath_init_leds(struct ath_softc *sc)
        if (AR_SREV_9100(sc->sc_ah))
                return;
  
@@ -13,7 +13,7 @@
                sc->sc_ah->led_pin = ATH_LED_PIN_DEF;
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -458,6 +458,7 @@ void ath9k_btcoex_timer_pause(struct ath
+@@ -466,6 +466,7 @@ void ath9k_btcoex_timer_pause(struct ath
  
  #define ATH_LED_PIN_DEF               1
  #define ATH_LED_PIN_9287              8
index 8669c8c048b8ef8e62faa642f50d8ecce1ac2bfd..9cb129309089ef3789e1ce26159380afc62aa341 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -677,7 +677,11 @@ void ath9k_set_hw_capab(struct ath_softc
+@@ -659,7 +659,11 @@ void ath9k_set_hw_capab(struct ath_softc
        hw->sta_data_size = sizeof(struct ath_node);
        hw->vif_data_size = sizeof(struct ath_vif);
  
diff --git a/package/mac80211/patches/510-ar9100_tsf_preserve.patch b/package/mac80211/patches/510-ar9100_tsf_preserve.patch
new file mode 100644 (file)
index 0000000..3af78da
--- /dev/null
@@ -0,0 +1,39 @@
+--- a/drivers/net/wireless/ath/ath9k/hw.c
++++ b/drivers/net/wireless/ath/ath9k/hw.c
+@@ -1280,7 +1280,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+       macStaId1 = REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_BASE_RATE_11B;
+       /* For chips on which RTC reset is done, save TSF before it gets cleared */
+-      if (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
++      if (AR_SREV_9100(ah) ||
++          (AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL)))
+               tsf = ath9k_hw_gettsf64(ah);
+       saveLedState = REG_READ(ah, AR_CFG_LED) &
+@@ -1312,7 +1313,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+       }
+       /* Restore TSF */
+-      if (tsf && AR_SREV_9280(ah) && ah->eep_ops->get_eeprom(ah, EEP_OL_PWRCTRL))
++      if (tsf)
+               ath9k_hw_settsf64(ah, tsf);
+       if (AR_SREV_9280_10_OR_LATER(ah))
+@@ -1325,6 +1326,17 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+       if (r)
+               return r;
++      /*
++       * Some AR91xx SoC devices frequently fail to accept TSF writes
++       * right after the chip reset. When that happens, write a new
++       * value after the initvals have been applied, with an offset
++       * based on measured time differences
++       */
++      if (AR_SREV_9100(ah) && (ath9k_hw_gettsf64(ah) < tsf)) {
++              tsf += 1500;
++              ath9k_hw_settsf64(ah, tsf);
++      }
++
+       /* Setup MFP options for CCMP */
+       if (AR_SREV_9280_20_OR_LATER(ah)) {
+               /* Mask Retry(b11), PwrMgt(b12), MoreData(b13) to 0 in mgmt
diff --git a/package/mac80211/patches/510-pending_work.patch b/package/mac80211/patches/510-pending_work.patch
deleted file mode 100644 (file)
index d52eaa4..0000000
+++ /dev/null
@@ -1,1893 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/Makefile
-+++ b/drivers/net/wireless/ath/ath9k/Makefile
-@@ -32,7 +32,8 @@ ath9k_hw-y:= \
-               mac.o \
-               ar9002_mac.o \
-               ar9003_mac.o \
--              ar9003_eeprom.o
-+              ar9003_eeprom.o \
-+              ar9003_paprd.o
- obj-$(CONFIG_ATH9K_HW) += ath9k_hw.o
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-@@ -67,6 +67,7 @@ static const struct ar9300_eeprom ar9300
-                 * bit2 - enable fastClock - enabled
-                 * bit3 - enable doubling - enabled
-                 * bit4 - enable internal regulator - disabled
-+                * bit5 - enable pa predistortion - disabled
-                 */
-               .miscConfiguration = 0, /* bit0 - turn down drivestrength */
-               .eepromWriteEnableGpio = 3,
-@@ -129,9 +130,11 @@ static const struct ar9300_eeprom ar9300
-               .txEndToRxOn = 0x2,
-               .txFrameToXpaOn = 0xe,
-               .thresh62 = 28,
--              .futureModal = { /* [32] */
-+              .papdRateMaskHt20 = LE32(0x80c080),
-+              .papdRateMaskHt40 = LE32(0x80c080),
-+              .futureModal = {
-                       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
--                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-+                      0, 0, 0, 0, 0, 0, 0, 0
-               },
-        },
-       .calFreqPier2G = {
-@@ -326,9 +329,11 @@ static const struct ar9300_eeprom ar9300
-               .txEndToRxOn = 0x2,
-               .txFrameToXpaOn = 0xe,
-               .thresh62 = 28,
-+              .papdRateMaskHt20 = LE32(0xf0e0e0),
-+              .papdRateMaskHt40 = LE32(0xf0e0e0),
-               .futureModal = {
-                       0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
--                      0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-+                      0, 0, 0, 0, 0, 0, 0, 0
-               },
-        },
-       .calFreqPier5G = {
-@@ -644,6 +649,8 @@ static u32 ath9k_hw_ar9300_get_eeprom(st
-               return (pBase->featureEnable & 0x10) >> 4;
-       case EEP_SWREG:
-               return le32_to_cpu(pBase->swreg);
-+      case EEP_PAPRD:
-+              return !!(pBase->featureEnable & BIT(5));
-       default:
-               return 0;
-       }
---- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
-@@ -234,7 +234,9 @@ struct ar9300_modal_eep_header {
-       u8 txEndToRxOn;
-       u8 txFrameToXpaOn;
-       u8 thresh62;
--      u8 futureModal[32];
-+      __le32 papdRateMaskHt20;
-+      __le32 papdRateMaskHt40;
-+      u8 futureModal[24];
- } __packed;
- struct ar9300_cal_data_per_freq_op_loop {
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
-@@ -470,6 +470,14 @@ static void ar9003_hw_set11n_virtualmore
-               ads->ctl11 &= ~AR_VirtMoreFrag;
- }
-+void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains)
-+{
-+      struct ar9003_txc *ads = ds;
-+
-+      ads->ctl12 |= SM(chains, AR_PAPRDChainMask);
-+}
-+EXPORT_SYMBOL(ar9003_hw_set_paprd_txdesc);
-+
- void ar9003_hw_attach_mac_ops(struct ath_hw *hw)
- {
-       struct ath_hw_ops *ops = ath9k_hw_ops(hw);
---- a/drivers/net/wireless/ath/ath9k/ar9003_mac.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.h
-@@ -40,6 +40,10 @@
- #define AR_Not_Sounding       0x20000000
-+/* ctl 12 */
-+#define AR_PAPRDChainMask     0x00000e00
-+#define AR_PAPRDChainMask_S   9
-+
- #define MAP_ISR_S2_CST          6
- #define MAP_ISR_S2_GTT          6
- #define MAP_ISR_S2_TIM          3
---- /dev/null
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
-@@ -0,0 +1,713 @@
-+/*
-+ * Copyright (c) 2010 Atheros Communications Inc.
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+ */
-+
-+#include "hw.h"
-+#include "ar9003_phy.h"
-+
-+void ar9003_paprd_enable(struct ath_hw *ah, bool val)
-+{
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B0,
-+                    AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B1,
-+                    AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL0_B2,
-+                    AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE, !!val);
-+}
-+EXPORT_SYMBOL(ar9003_paprd_enable);
-+
-+static void ar9003_paprd_setup_single_table(struct ath_hw *ah)
-+{
-+      struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
-+      struct ar9300_modal_eep_header *hdr;
-+      const u32 ctrl0[3] = {
-+              AR_PHY_PAPRD_CTRL0_B0,
-+              AR_PHY_PAPRD_CTRL0_B1,
-+              AR_PHY_PAPRD_CTRL0_B2
-+      };
-+      const u32 ctrl1[3] = {
-+              AR_PHY_PAPRD_CTRL1_B0,
-+              AR_PHY_PAPRD_CTRL1_B1,
-+              AR_PHY_PAPRD_CTRL1_B2
-+      };
-+      u32 am_mask, ht40_mask;
-+      int i;
-+
-+      if (ah->curchan && IS_CHAN_5GHZ(ah->curchan))
-+              hdr = &eep->modalHeader5G;
-+      else
-+              hdr = &eep->modalHeader2G;
-+
-+      am_mask = le32_to_cpu(hdr->papdRateMaskHt20);
-+      ht40_mask = le32_to_cpu(hdr->papdRateMaskHt40);
-+
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2AM, AR_PHY_PAPRD_AM2AM_MASK, am_mask);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_AM2PM, AR_PHY_PAPRD_AM2PM_MASK, am_mask);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_HT40, AR_PHY_PAPRD_HT40_MASK, ht40_mask);
-+
-+      for (i = 0; i < 3; i++) {
-+              REG_RMW_FIELD(ah, ctrl0[i],
-+                            AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK, 1);
-+              REG_RMW_FIELD(ah, ctrl1[i],
-+                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE, 1);
-+              REG_RMW_FIELD(ah, ctrl1[i],
-+                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE, 1);
-+              REG_RMW_FIELD(ah, ctrl1[i],
-+                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
-+              REG_RMW_FIELD(ah, ctrl1[i],
-+                            AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK, 181);
-+              REG_RMW_FIELD(ah, ctrl1[i],
-+                            AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT, 361);
-+              REG_RMW_FIELD(ah, ctrl1[i],
-+                            AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA, 0);
-+              REG_RMW_FIELD(ah, ctrl0[i],
-+                            AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH, 3);
-+      }
-+
-+      ar9003_paprd_enable(ah, false);
-+
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
-+                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP, 0x30);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
-+                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE, 1);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
-+                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE, 1);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
-+                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE, 0);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
-+                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE, 0);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
-+                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING, 28);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL1,
-+                    AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE, 1);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL2,
-+                    AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN, 147);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN, 4);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN, 4);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES, 7);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL, 1);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP, -6);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE,
-+                    -15);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL3,
-+                    AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE, 1);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
-+                    AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA, 0);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
-+                    AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR, 400);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_TRAINER_CNTL4,
-+                    AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES,
-+                    100);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_0_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 261376);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_1_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 248079);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_2_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 233759);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_3_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 220464);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_4_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 208194);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_5_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 196949);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_6_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 185706);
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_PRE_POST_SCALE_7_B0,
-+                    AR_PHY_PAPRD_PRE_POST_SCALING, 175487);
-+}
-+
-+static void ar9003_paprd_get_gain_table(struct ath_hw *ah)
-+{
-+      u32 *entry = ah->paprd_gain_table_entries;
-+      u8 *index = ah->paprd_gain_table_index;
-+      u32 reg = AR_PHY_TXGAIN_TABLE;
-+      int i;
-+
-+      memset(entry, 0, sizeof(ah->paprd_gain_table_entries));
-+      memset(index, 0, sizeof(ah->paprd_gain_table_index));
-+
-+      for (i = 0; i < 32; i++) {
-+              entry[i] = REG_READ(ah, reg);
-+              index[i] = (entry[i] >> 24) & 0xff;
-+              reg += 4;
-+      }
-+}
-+
-+static unsigned int ar9003_get_desired_gain(struct ath_hw *ah, int chain,
-+                                          int target_power)
-+{
-+      int olpc_gain_delta = 0;
-+      int alpha_therm, alpha_volt;
-+      int therm_cal_value, volt_cal_value;
-+      int therm_value, volt_value;
-+      int thermal_gain_corr, voltage_gain_corr;
-+      int desired_scale, desired_gain = 0;
-+      u32 reg;
-+
-+      REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
-+                  AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
-+      desired_scale = REG_READ_FIELD(ah, AR_PHY_TPC_12,
-+                                     AR_PHY_TPC_12_DESIRED_SCALE_HT40_5);
-+      alpha_therm = REG_READ_FIELD(ah, AR_PHY_TPC_19,
-+                                   AR_PHY_TPC_19_ALPHA_THERM);
-+      alpha_volt = REG_READ_FIELD(ah, AR_PHY_TPC_19,
-+                                  AR_PHY_TPC_19_ALPHA_VOLT);
-+      therm_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
-+                                       AR_PHY_TPC_18_THERM_CAL_VALUE);
-+      volt_cal_value = REG_READ_FIELD(ah, AR_PHY_TPC_18,
-+                                      AR_PHY_TPC_18_VOLT_CAL_VALUE);
-+      therm_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
-+                                   AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE);
-+      volt_value = REG_READ_FIELD(ah, AR_PHY_BB_THERM_ADC_4,
-+                                  AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE);
-+
-+      if (chain == 0)
-+              reg = AR_PHY_TPC_11_B0;
-+      else if (chain == 1)
-+              reg = AR_PHY_TPC_11_B1;
-+      else
-+              reg = AR_PHY_TPC_11_B2;
-+
-+      olpc_gain_delta = REG_READ_FIELD(ah, reg,
-+                                       AR_PHY_TPC_11_OLPC_GAIN_DELTA);
-+
-+      if (olpc_gain_delta >= 128)
-+              olpc_gain_delta = olpc_gain_delta - 256;
-+
-+      thermal_gain_corr = (alpha_therm * (therm_value - therm_cal_value) +
-+                           (256 / 2)) / 256;
-+      voltage_gain_corr = (alpha_volt * (volt_value - volt_cal_value) +
-+                           (128 / 2)) / 128;
-+      desired_gain = target_power - olpc_gain_delta - thermal_gain_corr -
-+          voltage_gain_corr + desired_scale;
-+
-+      return desired_gain;
-+}
-+
-+static void ar9003_tx_force_gain(struct ath_hw *ah, unsigned int gain_index)
-+{
-+      int selected_gain_entry, txbb1dbgain, txbb6dbgain, txmxrgain;
-+      int padrvgnA, padrvgnB, padrvgnC, padrvgnD;
-+      u32 *gain_table_entries = ah->paprd_gain_table_entries;
-+
-+      selected_gain_entry = gain_table_entries[gain_index];
-+      txbb1dbgain = selected_gain_entry & 0x7;
-+      txbb6dbgain = (selected_gain_entry >> 3) & 0x3;
-+      txmxrgain = (selected_gain_entry >> 5) & 0xf;
-+      padrvgnA = (selected_gain_entry >> 9) & 0xf;
-+      padrvgnB = (selected_gain_entry >> 13) & 0xf;
-+      padrvgnC = (selected_gain_entry >> 17) & 0xf;
-+      padrvgnD = (selected_gain_entry >> 21) & 0x3;
-+
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN, txbb1dbgain);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN, txbb6dbgain);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN, txmxrgain);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA, padrvgnA);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB, padrvgnB);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC, padrvgnC);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND, padrvgnD);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL, 0);
-+      REG_RMW_FIELD(ah, AR_PHY_TX_FORCED_GAIN,
-+                    AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN, 0);
-+      REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCED_DAC_GAIN, 0);
-+      REG_RMW_FIELD(ah, AR_PHY_TPC_1, AR_PHY_TPC_1_FORCE_DAC_GAIN, 0);
-+}
-+
-+static inline int find_expn(int num)
-+{
-+      return fls(num) - 1;
-+}
-+
-+static inline int find_proper_scale(int expn, int N)
-+{
-+      return (expn > N) ? expn - 10 : 0;
-+}
-+
-+#define NUM_BIN 23
-+
-+static bool create_pa_curve(u32 *data_L, u32 *data_U, u32 *pa_table, u16 *gain)
-+{
-+      unsigned int thresh_accum_cnt;
-+      int x_est[NUM_BIN + 1], Y[NUM_BIN + 1], theta[NUM_BIN + 1];
-+      int PA_in[NUM_BIN + 1];
-+      int B1_tmp[NUM_BIN + 1], B2_tmp[NUM_BIN + 1];
-+      unsigned int B1_abs_max, B2_abs_max;
-+      int max_index, scale_factor;
-+      int y_est[NUM_BIN + 1];
-+      int x_est_fxp1_nonlin, x_tilde[NUM_BIN + 1];
-+      unsigned int x_tilde_abs;
-+      int G_fxp, Y_intercept, order_x_by_y, M, I, L, sum_y_sqr, sum_y_quad;
-+      int Q_x, Q_B1, Q_B2, beta_raw, alpha_raw, scale_B;
-+      int Q_scale_B, Q_beta, Q_alpha, alpha, beta, order_1, order_2;
-+      int order1_5x, order2_3x, order1_5x_rem, order2_3x_rem;
-+      int y5, y3, tmp;
-+      int theta_low_bin = 0;
-+      int i;
-+
-+      /* disregard any bin that contains <= 16 samples */
-+      thresh_accum_cnt = 16;
-+      scale_factor = 5;
-+      max_index = 0;
-+      memset(theta, 0, sizeof(theta));
-+      memset(x_est, 0, sizeof(x_est));
-+      memset(Y, 0, sizeof(Y));
-+      memset(y_est, 0, sizeof(y_est));
-+      memset(x_tilde, 0, sizeof(x_tilde));
-+
-+      for (i = 0; i < NUM_BIN; i++) {
-+              s32 accum_cnt, accum_tx, accum_rx, accum_ang;
-+
-+              /* number of samples */
-+              accum_cnt = data_L[i] & 0xffff;
-+
-+              if (accum_cnt <= thresh_accum_cnt)
-+                      continue;
-+
-+              /* sum(tx amplitude) */
-+              accum_tx = ((data_L[i] >> 16) & 0xffff) |
-+                  ((data_U[i] & 0x7ff) << 16);
-+
-+              /* sum(rx amplitude distance to lower bin edge) */
-+              accum_rx = ((data_U[i] >> 11) & 0x1f) |
-+                  ((data_L[i + 23] & 0xffff) << 5);
-+
-+              /* sum(angles) */
-+              accum_ang = ((data_L[i + 23] >> 16) & 0xffff) |
-+                  ((data_U[i + 23] & 0x7ff) << 16);
-+
-+              accum_tx <<= scale_factor;
-+              accum_rx <<= scale_factor;
-+              x_est[i + 1] = (((accum_tx + accum_cnt) / accum_cnt) + 32) >>
-+                  scale_factor;
-+
-+              Y[i + 1] = ((((accum_rx + accum_cnt) / accum_cnt) + 32) >>
-+                          scale_factor) + (1 << scale_factor) * max_index + 16;
-+
-+              if (accum_ang >= (1 << 26))
-+                      accum_ang -= 1 << 27;
-+
-+              theta[i + 1] = ((accum_ang * (1 << scale_factor)) + accum_cnt) /
-+                  accum_cnt;
-+
-+              max_index++;
-+      }
-+
-+      /*
-+       * Find average theta of first 5 bin and all of those to same value.
-+       * Curve is linear at that range.
-+       */
-+      for (i = 1; i < 6; i++)
-+              theta_low_bin += theta[i];
-+
-+      theta_low_bin = theta_low_bin / 5;
-+      for (i = 1; i < 6; i++)
-+              theta[i] = theta_low_bin;
-+
-+      /* Set values at origin */
-+      theta[0] = theta_low_bin;
-+      for (i = 0; i <= max_index; i++)
-+              theta[i] -= theta_low_bin;
-+
-+      x_est[0] = 0;
-+      Y[0] = 0;
-+      scale_factor = 8;
-+
-+      /* low signal gain */
-+      if (x_est[6] == x_est[3])
-+              return false;
-+
-+      G_fxp =
-+          (((Y[6] - Y[3]) * 1 << scale_factor) +
-+           (x_est[6] - x_est[3])) / (x_est[6] - x_est[3]);
-+
-+      Y_intercept =
-+          (G_fxp * (x_est[0] - x_est[3]) +
-+           (1 << scale_factor)) / (1 << scale_factor) + Y[3];
-+
-+      for (i = 0; i <= max_index; i++)
-+              y_est[i] = Y[i] - Y_intercept;
-+
-+      for (i = 0; i <= 3; i++) {
-+              y_est[i] = i * 32;
-+
-+              /* prevent division by zero */
-+              if (G_fxp == 0)
-+                      return false;
-+
-+              x_est[i] = ((y_est[i] * 1 << scale_factor) + G_fxp) / G_fxp;
-+      }
-+
-+      x_est_fxp1_nonlin =
-+          x_est[max_index] - ((1 << scale_factor) * y_est[max_index] +
-+                              G_fxp) / G_fxp;
-+
-+      order_x_by_y =
-+          (x_est_fxp1_nonlin + y_est[max_index]) / y_est[max_index];
-+
-+      if (order_x_by_y == 0)
-+              M = 10;
-+      else if (order_x_by_y == 1)
-+              M = 9;
-+      else
-+              M = 8;
-+
-+      I = (max_index > 15) ? 7 : max_index >> 1;
-+      L = max_index - I;
-+      scale_factor = 8;
-+      sum_y_sqr = 0;
-+      sum_y_quad = 0;
-+      x_tilde_abs = 0;
-+
-+      for (i = 0; i <= L; i++) {
-+              unsigned int y_sqr;
-+              unsigned int y_quad;
-+              unsigned int tmp_abs;
-+
-+              /* prevent division by zero */
-+              if (y_est[i + I] == 0)
-+                      return false;
-+
-+              x_est_fxp1_nonlin =
-+                  x_est[i + I] - ((1 << scale_factor) * y_est[i + I] +
-+                                  G_fxp) / G_fxp;
-+
-+              x_tilde[i] =
-+                  (x_est_fxp1_nonlin * (1 << M) + y_est[i + I]) / y_est[i +
-+                                                                        I];
-+              x_tilde[i] =
-+                  (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
-+              x_tilde[i] =
-+                  (x_tilde[i] * (1 << M) + y_est[i + I]) / y_est[i + I];
-+              y_sqr =
-+                  (y_est[i + I] * y_est[i + I] +
-+                   (scale_factor * scale_factor)) / (scale_factor *
-+                                                     scale_factor);
-+              tmp_abs = abs(x_tilde[i]);
-+              if (tmp_abs > x_tilde_abs)
-+                      x_tilde_abs = tmp_abs;
-+
-+              y_quad = y_sqr * y_sqr;
-+              sum_y_sqr = sum_y_sqr + y_sqr;
-+              sum_y_quad = sum_y_quad + y_quad;
-+              B1_tmp[i] = y_sqr * (L + 1);
-+              B2_tmp[i] = y_sqr;
-+      }
-+
-+      B1_abs_max = 0;
-+      B2_abs_max = 0;
-+      for (i = 0; i <= L; i++) {
-+              int abs_val;
-+
-+              B1_tmp[i] -= sum_y_sqr;
-+              B2_tmp[i] = sum_y_quad - sum_y_sqr * B2_tmp[i];
-+
-+              abs_val = abs(B1_tmp[i]);
-+              if (abs_val > B1_abs_max)
-+                      B1_abs_max = abs_val;
-+
-+              abs_val = abs(B2_tmp[i]);
-+              if (abs_val > B2_abs_max)
-+                      B2_abs_max = abs_val;
-+      }
-+
-+      Q_x = find_proper_scale(find_expn(x_tilde_abs), 10);
-+      Q_B1 = find_proper_scale(find_expn(B1_abs_max), 10);
-+      Q_B2 = find_proper_scale(find_expn(B2_abs_max), 10);
-+
-+      beta_raw = 0;
-+      alpha_raw = 0;
-+      for (i = 0; i <= L; i++) {
-+              x_tilde[i] = x_tilde[i] / (1 << Q_x);
-+              B1_tmp[i] = B1_tmp[i] / (1 << Q_B1);
-+              B2_tmp[i] = B2_tmp[i] / (1 << Q_B2);
-+              beta_raw = beta_raw + B1_tmp[i] * x_tilde[i];
-+              alpha_raw = alpha_raw + B2_tmp[i] * x_tilde[i];
-+      }
-+
-+      scale_B =
-+          ((sum_y_quad / scale_factor) * (L + 1) -
-+           (sum_y_sqr / scale_factor) * sum_y_sqr) * scale_factor;
-+
-+      Q_scale_B = find_proper_scale(find_expn(abs(scale_B)), 10);
-+      scale_B = scale_B / (1 << Q_scale_B);
-+      Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
-+      Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
-+      beta_raw = beta_raw / (1 << Q_beta);
-+      alpha_raw = alpha_raw / (1 << Q_alpha);
-+      alpha = (alpha_raw << 10) / scale_B;
-+      beta = (beta_raw << 10) / scale_B;
-+      order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B;
-+      order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B;
-+      order1_5x = order_1 / 5;
-+      order2_3x = order_2 / 3;
-+      order1_5x_rem = order_1 - 5 * order1_5x;
-+      order2_3x_rem = order_2 - 3 * order2_3x;
-+
-+      for (i = 0; i < PAPRD_TABLE_SZ; i++) {
-+              tmp = i * 32;
-+              y5 = ((beta * tmp) >> 6) >> order1_5x;
-+              y5 = (y5 * tmp) >> order1_5x;
-+              y5 = (y5 * tmp) >> order1_5x;
-+              y5 = (y5 * tmp) >> order1_5x;
-+              y5 = (y5 * tmp) >> order1_5x;
-+              y5 = y5 >> order1_5x_rem;
-+              y3 = (alpha * tmp) >> order2_3x;
-+              y3 = (y3 * tmp) >> order2_3x;
-+              y3 = (y3 * tmp) >> order2_3x;
-+              y3 = y3 >> order2_3x_rem;
-+              PA_in[i] = y5 + y3 + (256 * tmp) / G_fxp;
-+
-+              if (i >= 2) {
-+                      tmp = PA_in[i] - PA_in[i - 1];
-+                      if (tmp < 0)
-+                              PA_in[i] =
-+                                  PA_in[i - 1] + (PA_in[i - 1] -
-+                                                  PA_in[i - 2]);
-+              }
-+
-+              PA_in[i] = (PA_in[i] < 1400) ? PA_in[i] : 1400;
-+      }
-+
-+      beta_raw = 0;
-+      alpha_raw = 0;
-+
-+      for (i = 0; i <= L; i++) {
-+              int theta_tilde =
-+                  ((theta[i + I] << M) + y_est[i + I]) / y_est[i + I];
-+              theta_tilde =
-+                  ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
-+              theta_tilde =
-+                  ((theta_tilde << M) + y_est[i + I]) / y_est[i + I];
-+              beta_raw = beta_raw + B1_tmp[i] * theta_tilde;
-+              alpha_raw = alpha_raw + B2_tmp[i] * theta_tilde;
-+      }
-+
-+      Q_beta = find_proper_scale(find_expn(abs(beta_raw)), 10);
-+      Q_alpha = find_proper_scale(find_expn(abs(alpha_raw)), 10);
-+      beta_raw = beta_raw / (1 << Q_beta);
-+      alpha_raw = alpha_raw / (1 << Q_alpha);
-+
-+      alpha = (alpha_raw << 10) / scale_B;
-+      beta = (beta_raw << 10) / scale_B;
-+      order_1 = 3 * M - Q_x - Q_B1 - Q_beta + 10 + Q_scale_B + 5;
-+      order_2 = 3 * M - Q_x - Q_B2 - Q_alpha + 10 + Q_scale_B + 5;
-+      order1_5x = order_1 / 5;
-+      order2_3x = order_2 / 3;
-+      order1_5x_rem = order_1 - 5 * order1_5x;
-+      order2_3x_rem = order_2 - 3 * order2_3x;
-+
-+      for (i = 0; i < PAPRD_TABLE_SZ; i++) {
-+              int PA_angle;
-+
-+              /* pa_table[4] is calculated from PA_angle for i=5 */
-+              if (i == 4)
-+                      continue;
-+
-+              tmp = i * 32;
-+              if (beta > 0)
-+                      y5 = (((beta * tmp - 64) >> 6) -
-+                            (1 << order1_5x)) / (1 << order1_5x);
-+              else
-+                      y5 = ((((beta * tmp - 64) >> 6) +
-+                             (1 << order1_5x)) / (1 << order1_5x));
-+
-+              y5 = (y5 * tmp) / (1 << order1_5x);
-+              y5 = (y5 * tmp) / (1 << order1_5x);
-+              y5 = (y5 * tmp) / (1 << order1_5x);
-+              y5 = (y5 * tmp) / (1 << order1_5x);
-+              y5 = y5 / (1 << order1_5x_rem);
-+
-+              if (beta > 0)
-+                      y3 = (alpha * tmp -
-+                            (1 << order2_3x)) / (1 << order2_3x);
-+              else
-+                      y3 = (alpha * tmp +
-+                            (1 << order2_3x)) / (1 << order2_3x);
-+              y3 = (y3 * tmp) / (1 << order2_3x);
-+              y3 = (y3 * tmp) / (1 << order2_3x);
-+              y3 = y3 / (1 << order2_3x_rem);
-+
-+              if (i < 4) {
-+                      PA_angle = 0;
-+              } else {
-+                      PA_angle = y5 + y3;
-+                      if (PA_angle < -150)
-+                              PA_angle = -150;
-+                      else if (PA_angle > 150)
-+                              PA_angle = 150;
-+              }
-+
-+              pa_table[i] = ((PA_in[i] & 0x7ff) << 11) + (PA_angle & 0x7ff);
-+              if (i == 5) {
-+                      PA_angle = (PA_angle + 2) >> 1;
-+                      pa_table[i - 1] = ((PA_in[i - 1] & 0x7ff) << 11) +
-+                          (PA_angle & 0x7ff);
-+              }
-+      }
-+
-+      *gain = G_fxp;
-+      return true;
-+}
-+
-+void ar9003_paprd_populate_single_table(struct ath_hw *ah,
-+                                      struct ath9k_channel *chan, int chain)
-+{
-+      u32 *paprd_table_val = chan->pa_table[chain];
-+      u32 small_signal_gain = chan->small_signal_gain[chain];
-+      u32 training_power;
-+      u32 reg = 0;
-+      int i;
-+
-+      training_power =
-+          REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
-+                         AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
-+      training_power -= 4;
-+
-+      if (chain == 0)
-+              reg = AR_PHY_PAPRD_MEM_TAB_B0;
-+      else if (chain == 1)
-+              reg = AR_PHY_PAPRD_MEM_TAB_B1;
-+      else if (chain == 2)
-+              reg = AR_PHY_PAPRD_MEM_TAB_B2;
-+
-+      for (i = 0; i < PAPRD_TABLE_SZ; i++) {
-+              REG_WRITE(ah, reg, paprd_table_val[i]);
-+              reg = reg + 4;
-+      }
-+
-+      if (chain == 0)
-+              reg = AR_PHY_PA_GAIN123_B0;
-+      else if (chain == 1)
-+              reg = AR_PHY_PA_GAIN123_B1;
-+      else
-+              reg = AR_PHY_PA_GAIN123_B2;
-+
-+      REG_RMW_FIELD(ah, reg, AR_PHY_PA_GAIN123_PA_GAIN1, small_signal_gain);
-+
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B0,
-+                    AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
-+                    training_power);
-+
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B1,
-+                    AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
-+                    training_power);
-+
-+      REG_RMW_FIELD(ah, AR_PHY_PAPRD_CTRL1_B2,
-+                    AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL,
-+                    training_power);
-+}
-+EXPORT_SYMBOL(ar9003_paprd_populate_single_table);
-+
-+int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain)
-+{
-+
-+      unsigned int i, desired_gain, gain_index;
-+      unsigned int train_power;
-+
-+      train_power = REG_READ_FIELD(ah, AR_PHY_POWERTX_RATE5,
-+                                   AR_PHY_POWERTX_RATE5_POWERTXHT20_0);
-+
-+      train_power = train_power - 4;
-+
-+      desired_gain = ar9003_get_desired_gain(ah, chain, train_power);
-+
-+      gain_index = 0;
-+      for (i = 0; i < 32; i++) {
-+              if (ah->paprd_gain_table_index[i] >= desired_gain)
-+                      break;
-+              gain_index++;
-+      }
-+
-+      ar9003_tx_force_gain(ah, gain_index);
-+
-+      REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
-+                      AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
-+
-+      return 0;
-+}
-+EXPORT_SYMBOL(ar9003_paprd_setup_gain_table);
-+
-+int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
-+                            int chain)
-+{
-+      u16 *small_signal_gain = &chan->small_signal_gain[chain];
-+      u32 *pa_table = chan->pa_table[chain];
-+      u32 *data_L, *data_U;
-+      int i, status = 0;
-+      u32 *buf;
-+      u32 reg;
-+
-+      memset(chan->pa_table[chain], 0, sizeof(chan->pa_table[chain]));
-+
-+      buf = kmalloc(2 * 48 * sizeof(u32), GFP_ATOMIC);
-+      if (!buf)
-+              return -ENOMEM;
-+
-+      data_L = &buf[0];
-+      data_U = &buf[48];
-+
-+      REG_CLR_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
-+                  AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
-+
-+      reg = AR_PHY_CHAN_INFO_TAB_0;
-+      for (i = 0; i < 48; i++)
-+              data_L[i] = REG_READ(ah, reg + (i << 2));
-+
-+      REG_SET_BIT(ah, AR_PHY_CHAN_INFO_MEMORY,
-+                  AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ);
-+
-+      for (i = 0; i < 48; i++)
-+              data_U[i] = REG_READ(ah, reg + (i << 2));
-+
-+      if (!create_pa_curve(data_L, data_U, pa_table, small_signal_gain))
-+              status = -2;
-+
-+      REG_CLR_BIT(ah, AR_PHY_PAPRD_TRAINER_STAT1,
-+                  AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
-+
-+      kfree(buf);
-+
-+      return status;
-+}
-+EXPORT_SYMBOL(ar9003_paprd_create_curve);
-+
-+int ar9003_paprd_init_table(struct ath_hw *ah)
-+{
-+      ar9003_paprd_setup_single_table(ah);
-+      ar9003_paprd_get_gain_table(ah);
-+      return 0;
-+}
-+EXPORT_SYMBOL(ar9003_paprd_init_table);
-+
-+bool ar9003_paprd_is_done(struct ath_hw *ah)
-+{
-+      return !!REG_READ_FIELD(ah, AR_PHY_PAPRD_TRAINER_STAT1,
-+                              AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE);
-+}
-+EXPORT_SYMBOL(ar9003_paprd_is_done);
---- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-@@ -451,7 +451,11 @@
- #define AR_PHY_TSTDAC            (AR_SM_BASE + 0x168)
- #define AR_PHY_CHAN_STATUS       (AR_SM_BASE + 0x16c)
--#define AR_PHY_CHAN_INFO_MEMORY  (AR_SM_BASE + 0x170)
-+
-+#define AR_PHY_CHAN_INFO_MEMORY                               (AR_SM_BASE + 0x170)
-+#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ   0x00000008
-+#define AR_PHY_CHAN_INFO_MEMORY_CHANINFOMEM_S2_READ_S 3
-+
- #define AR_PHY_CHNINFO_NOISEPWR  (AR_SM_BASE + 0x174)
- #define AR_PHY_CHNINFO_GAINDIFF  (AR_SM_BASE + 0x178)
- #define AR_PHY_CHNINFO_FINETIM   (AR_SM_BASE + 0x17c)
-@@ -467,17 +471,63 @@
- #define AR_PHY_PWRTX_MAX         (AR_SM_BASE + 0x1f0)
- #define AR_PHY_POWER_TX_SUB      (AR_SM_BASE + 0x1f4)
--#define AR_PHY_TPC_4_B0          (AR_SM_BASE + 0x204)
--#define AR_PHY_TPC_5_B0          (AR_SM_BASE + 0x208)
--#define AR_PHY_TPC_6_B0          (AR_SM_BASE + 0x20c)
--#define AR_PHY_TPC_11_B0         (AR_SM_BASE + 0x220)
--#define AR_PHY_TPC_18            (AR_SM_BASE + 0x23c)
--#define AR_PHY_TPC_19            (AR_SM_BASE + 0x240)
-+#define AR_PHY_TPC_1                          (AR_SM_BASE + 0x1f8)
-+#define AR_PHY_TPC_1_FORCED_DAC_GAIN          0x0000003e
-+#define AR_PHY_TPC_1_FORCED_DAC_GAIN_S                1
-+#define AR_PHY_TPC_1_FORCE_DAC_GAIN           0x00000001
-+#define AR_PHY_TPC_1_FORCE_DAC_GAIN_S         0
-+
-+#define AR_PHY_TPC_4_B0                               (AR_SM_BASE + 0x204)
-+#define AR_PHY_TPC_5_B0                               (AR_SM_BASE + 0x208)
-+#define AR_PHY_TPC_6_B0                               (AR_SM_BASE + 0x20c)
-+
-+#define AR_PHY_TPC_11_B0                      (AR_SM_BASE + 0x220)
-+#define AR_PHY_TPC_11_B1                      (AR_SM1_BASE + 0x220)
-+#define AR_PHY_TPC_11_B2                      (AR_SM2_BASE + 0x220)
-+#define AR_PHY_TPC_11_OLPC_GAIN_DELTA         0x00ff0000
-+#define AR_PHY_TPC_11_OLPC_GAIN_DELTA_S               16
-+
-+#define AR_PHY_TPC_12                         (AR_SM_BASE + 0x224)
-+#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5    0x3e000000
-+#define AR_PHY_TPC_12_DESIRED_SCALE_HT40_5_S  25
-+
-+#define AR_PHY_TPC_18                         (AR_SM_BASE + 0x23c)
-+#define AR_PHY_TPC_18_THERM_CAL_VALUE           0x000000ff
-+#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
-+#define AR_PHY_TPC_18_VOLT_CAL_VALUE          0x0000ff00
-+#define AR_PHY_TPC_18_VOLT_CAL_VALUE_S                8
-+
-+#define AR_PHY_TPC_19                         (AR_SM_BASE + 0x240)
-+#define AR_PHY_TPC_19_ALPHA_VOLT              0x001f0000
-+#define AR_PHY_TPC_19_ALPHA_VOLT_S            16
-+#define AR_PHY_TPC_19_ALPHA_THERM             0xff
-+#define AR_PHY_TPC_19_ALPHA_THERM_S           0
-+
-+#define AR_PHY_TX_FORCED_GAIN                         (AR_SM_BASE + 0x258)
-+#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN           0x00000001
-+#define AR_PHY_TX_FORCED_GAIN_FORCE_TX_GAIN_S         0
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN      0x0000000e
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB1DBGAIN_S    1
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN      0x00000030
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXBB6DBGAIN_S    4
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN                0x000003c0
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_TXMXRGAIN_S      6
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA         0x00003c00
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNA_S               10
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB         0x0003c000
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNB_S               14
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC         0x003c0000
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGNC_S               18
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND         0x00c00000
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_PADRVGND_S               22
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL               0x01000000
-+#define AR_PHY_TX_FORCED_GAIN_FORCED_ENABLE_PAL_S     24
--#define AR_PHY_TX_FORCED_GAIN    (AR_SM_BASE + 0x258)
- #define AR_PHY_PDADC_TAB_0       (AR_SM_BASE + 0x280)
-+#define AR_PHY_TXGAIN_TABLE      (AR_SM_BASE + 0x300)
-+
- #define AR_PHY_TX_IQCAL_CONTROL_1   (AR_SM_BASE + 0x448)
- #define AR_PHY_TX_IQCAL_START       (AR_SM_BASE + 0x440)
- #define AR_PHY_TX_IQCAL_STATUS_B0   (AR_SM_BASE + 0x48c)
-@@ -490,7 +540,17 @@
- #define AR_PHY_ONLY_WARMRESET       (AR_SM_BASE + 0x5d0)
- #define AR_PHY_ONLY_CTL             (AR_SM_BASE + 0x5d4)
- #define AR_PHY_ECO_CTRL             (AR_SM_BASE + 0x5dc)
--#define AR_PHY_BB_THERM_ADC_1       (AR_SM_BASE + 0x248)
-+
-+#define AR_PHY_BB_THERM_ADC_1                         (AR_SM_BASE + 0x248)
-+#define AR_PHY_BB_THERM_ADC_1_INIT_THERM              0x000000ff
-+#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S            0
-+
-+#define AR_PHY_BB_THERM_ADC_4                         (AR_SM_BASE + 0x254)
-+#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE      0x000000ff
-+#define AR_PHY_BB_THERM_ADC_4_LATEST_THERM_VALUE_S    0
-+#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE               0x0000ff00
-+#define AR_PHY_BB_THERM_ADC_4_LATEST_VOLT_VALUE_S     8
-+
- #define AR_PHY_65NM_CH0_SYNTH4      0x1608c
- #define AR_PHY_SYNTH4_LONG_SHIFT_SELECT   0x00000002
-@@ -660,17 +720,9 @@
- #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE      0x00003fff
- #define AR_PHY_TX_IQCAL_CORR_COEFF_01_COEFF_TABLE_S    0
--#define AR_PHY_TPC_18_THERM_CAL_VALUE           0xff
--#define AR_PHY_TPC_18_THERM_CAL_VALUE_S         0
--#define AR_PHY_TPC_19_ALPHA_THERM               0xff
--#define AR_PHY_TPC_19_ALPHA_THERM_S             0
--
- #define AR_PHY_65NM_CH0_RXTX4_THERM_ON          0x10000000
- #define AR_PHY_65NM_CH0_RXTX4_THERM_ON_S        28
--#define AR_PHY_BB_THERM_ADC_1_INIT_THERM        0x000000ff
--#define AR_PHY_BB_THERM_ADC_1_INIT_THERM_S      0
--
- /*
-  * Channel 1 Register Map
-  */
-@@ -842,6 +894,144 @@
- #define AR_PHY_WATCHDOG_STATUS_CLR         0x00000008
-+/*
-+ * PAPRD registers
-+ */
-+#define AR_PHY_XPA_TIMING_CTL         (AR_SM_BASE + 0x64)
-+
-+#define AR_PHY_PAPRD_AM2AM            (AR_CHAN_BASE + 0xe4)
-+#define AR_PHY_PAPRD_AM2AM_MASK               0x01ffffff
-+#define AR_PHY_PAPRD_AM2AM_MASK_S     0
-+
-+#define AR_PHY_PAPRD_AM2PM            (AR_CHAN_BASE + 0xe8)
-+#define AR_PHY_PAPRD_AM2PM_MASK               0x01ffffff
-+#define AR_PHY_PAPRD_AM2PM_MASK_S     0
-+
-+#define AR_PHY_PAPRD_HT40             (AR_CHAN_BASE + 0xec)
-+#define AR_PHY_PAPRD_HT40_MASK                0x01ffffff
-+#define AR_PHY_PAPRD_HT40_MASK_S      0
-+
-+#define AR_PHY_PAPRD_CTRL0_B0                         (AR_CHAN_BASE + 0xf0)
-+#define AR_PHY_PAPRD_CTRL0_B1                         (AR_CHAN1_BASE + 0xf0)
-+#define AR_PHY_PAPRD_CTRL0_B2                         (AR_CHAN2_BASE + 0xf0)
-+#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE                       0x00000001
-+#define AR_PHY_PAPRD_CTRL0_PAPRD_ENABLE_S             0
-+#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK      0x00000002
-+#define AR_PHY_PAPRD_CTRL0_USE_SINGLE_TABLE_MASK_S    1
-+#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH            0xf8000000
-+#define AR_PHY_PAPRD_CTRL0_PAPRD_MAG_THRSH_S          27
-+
-+#define AR_PHY_PAPRD_CTRL1_B0                         (AR_CHAN_BASE + 0xf4)
-+#define AR_PHY_PAPRD_CTRL1_B1                         (AR_CHAN1_BASE + 0xf4)
-+#define AR_PHY_PAPRD_CTRL1_B2                         (AR_CHAN2_BASE + 0xf4)
-+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA               0x00000001
-+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_SCALING_ENA_S     0
-+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE      0x00000002
-+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2AM_ENABLE_S    1
-+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE      0x00000004
-+#define AR_PHY_PAPRD_CTRL1_ADAPTIVE_AM2PM_ENABLE_S    2
-+#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL   0x000001f8
-+#define AR_PHY_PAPRD_CTRL1_PAPRD_POWER_AT_AM2AM_CAL_S 3
-+#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK    0x0001fe00
-+#define AR_PHY_PAPRD_CTRL1_PA_GAIN_SCALE_FACT_MASK_S  9
-+#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT               0x0ffe0000
-+#define AR_PHY_PAPRD_CTRL1_PAPRD_MAG_SCALE_FACT_S     17
-+
-+#define AR_PHY_PAPRD_TRAINER_CNTL1                            (AR_SM_BASE + 0x490)
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE   0x00000001
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_CF_PAPRD_TRAIN_ENABLE_S 0
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING     0x0000007e
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_AGC2_SETTLING_S   1
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE     0x00000100
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_IQCORR_ENABLE_S   8
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE  0x00000200
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_RX_BB_GAIN_FORCE_S        9
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE     0x00000400
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_TX_GAIN_FORCE_S   10
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE         0x00000800
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_ENABLE_S               11
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP           0x0003f000
-+#define AR_PHY_PAPRD_TRAINER_CNTL1_CF_PAPRD_LB_SKIP_S         12
-+
-+#define AR_PHY_PAPRD_TRAINER_CNTL2                            (AR_SM_BASE + 0x494)
-+#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN   0xFFFFFFFF
-+#define AR_PHY_PAPRD_TRAINER_CNTL2_CF_PAPRD_INIT_RX_BB_GAIN_S 0
-+
-+#define AR_PHY_PAPRD_TRAINER_CNTL3                            (AR_SM_BASE + 0x498)
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE  0x0000003f
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_ADC_DESIRED_SIZE_S        0
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP                0x00000fc0
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_QUICK_DROP_S      6
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL  0x0001f000
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_MIN_LOOPBACK_DEL_S        12
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES   0x000e0000
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_NUM_CORR_STAGES_S 17
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN   0x00f00000
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_COARSE_CORR_LEN_S 20
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN     0x0f000000
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_FINE_CORR_LEN_S   24
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE   0x20000000
-+#define AR_PHY_PAPRD_TRAINER_CNTL3_CF_PAPRD_BBTXMIX_DISABLE_S 29
-+
-+#define AR_PHY_PAPRD_TRAINER_CNTL4                            (AR_SM_BASE + 0x49c)
-+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES 0x03ff0000
-+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_NUM_TRAIN_SAMPLES_S       16
-+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA      0x0000f000
-+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_SAFETY_DELTA_S    12
-+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR          0x00000fff
-+#define AR_PHY_PAPRD_TRAINER_CNTL4_CF_PAPRD_MIN_CORR_S                0
-+
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_0_B0                      (AR_CHAN_BASE + 0x100)
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_1_B0                      (AR_CHAN_BASE + 0x104)
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_2_B0                      (AR_CHAN_BASE + 0x108)
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_3_B0                      (AR_CHAN_BASE + 0x10c)
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_4_B0                      (AR_CHAN_BASE + 0x110)
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_5_B0                      (AR_CHAN_BASE + 0x114)
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_6_B0                      (AR_CHAN_BASE + 0x118)
-+#define AR_PHY_PAPRD_PRE_POST_SCALE_7_B0                      (AR_CHAN_BASE + 0x11c)
-+#define AR_PHY_PAPRD_PRE_POST_SCALING                         0x3FFFF
-+#define AR_PHY_PAPRD_PRE_POST_SCALING_S                               0
-+
-+#define AR_PHY_PAPRD_TRAINER_STAT1                            (AR_SM_BASE + 0x4a0)
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE           0x00000001
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_DONE_S         0
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE     0x00000002
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_INCOMPLETE_S   1
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR             0x00000004
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_CORR_ERR_S           2
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE         0x00000008
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_TRAIN_ACTIVE_S               3
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX          0x000001f0
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_RX_GAIN_IDX_S                4
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR             0x0001fe00
-+#define AR_PHY_PAPRD_TRAINER_STAT1_PAPRD_AGC2_PWR_S           9
-+
-+#define AR_PHY_PAPRD_TRAINER_STAT2                            (AR_SM_BASE + 0x4a4)
-+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL             0x0000ffff
-+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_VAL_S           0
-+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX           0x001f0000
-+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_COARSE_IDX_S         16
-+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX             0x00600000
-+#define AR_PHY_PAPRD_TRAINER_STAT2_PAPRD_FINE_IDX_S           21
-+
-+#define AR_PHY_PAPRD_TRAINER_STAT3                            (AR_SM_BASE + 0x4a8)
-+#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT    0x000fffff
-+#define AR_PHY_PAPRD_TRAINER_STAT3_PAPRD_TRAIN_SAMPLES_CNT_S  0
-+
-+#define AR_PHY_PAPRD_MEM_TAB_B0                       (AR_CHAN_BASE + 0x120)
-+#define AR_PHY_PAPRD_MEM_TAB_B1                       (AR_CHAN1_BASE + 0x120)
-+#define AR_PHY_PAPRD_MEM_TAB_B2                       (AR_CHAN2_BASE + 0x120)
-+
-+#define AR_PHY_PA_GAIN123_B0                  (AR_CHAN_BASE + 0xf8)
-+#define AR_PHY_PA_GAIN123_B1                  (AR_CHAN1_BASE + 0xf8)
-+#define AR_PHY_PA_GAIN123_B2                  (AR_CHAN2_BASE + 0xf8)
-+#define AR_PHY_PA_GAIN123_PA_GAIN1            0x3FF
-+#define AR_PHY_PA_GAIN123_PA_GAIN1_S          0
-+
-+#define AR_PHY_POWERTX_RATE5                  (AR_SM_BASE + 0x1d0)
-+#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0    0x3F
-+#define AR_PHY_POWERTX_RATE5_POWERTXHT20_0_S  0
-+
- void ar9003_hw_set_chain_masks(struct ath_hw *ah, u8 rx, u8 tx);
- #endif  /* AR9003_PHY_H */
---- a/drivers/net/wireless/ath/ath9k/ath9k.h
-+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -20,6 +20,7 @@
- #include <linux/etherdevice.h>
- #include <linux/device.h>
- #include <linux/leds.h>
-+#include <linux/completion.h>
- #include "debug.h"
- #include "common.h"
-@@ -194,6 +195,7 @@ enum ATH_AGGR_STATUS {
- #define ATH_TXFIFO_DEPTH 8
- struct ath_txq {
-+      int axq_class;
-       u32 axq_qnum;
-       u32 *axq_link;
-       struct list_head axq_q;
-@@ -206,7 +208,6 @@ struct ath_txq {
-       struct list_head txq_fifo_pending;
-       u8 txq_headidx;
-       u8 txq_tailidx;
--      int pending_frames;
- };
- struct ath_atx_ac {
-@@ -224,6 +225,7 @@ struct ath_buf_state {
-       int bfs_tidno;
-       int bfs_retries;
-       u8 bf_type;
-+      u8 bfs_paprd;
-       u32 bfs_keyix;
-       enum ath9k_key_type bfs_keytype;
- };
-@@ -244,7 +246,6 @@ struct ath_buf {
-       struct ath_buf_state bf_state;
-       dma_addr_t bf_dmacontext;
-       struct ath_wiphy *aphy;
--      struct ath_txq *txq;
- };
- struct ath_atx_tid {
-@@ -281,6 +282,7 @@ struct ath_tx_control {
-       struct ath_txq *txq;
-       int if_id;
-       enum ath9k_internal_frame_type frame_type;
-+      u8 paprd;
- };
- #define ATH_TX_ERROR        0x01
-@@ -290,11 +292,12 @@ struct ath_tx_control {
- struct ath_tx {
-       u16 seq_no;
-       u32 txqsetup;
--      int hwq_map[ATH9K_WME_AC_VO+1];
-+      int hwq_map[WME_NUM_AC];
-       spinlock_t txbuflock;
-       struct list_head txbuf;
-       struct ath_txq txq[ATH9K_NUM_TX_QUEUES];
-       struct ath_descdma txdma;
-+      int pending_frames[WME_NUM_AC];
- };
- struct ath_rx_edma {
-@@ -421,6 +424,7 @@ int ath_beaconq_config(struct ath_softc 
- #define ATH_LONG_CALINTERVAL      30000   /* 30 seconds */
- #define ATH_RESTART_CALINTERVAL   1200000 /* 20 minutes */
-+void ath_paprd_calibrate(struct work_struct *work);
- void ath_ani_calibrate(unsigned long data);
- /**********/
-@@ -553,6 +557,9 @@ struct ath_softc {
-       spinlock_t sc_serial_rw;
-       spinlock_t sc_pm_lock;
-       struct mutex mutex;
-+      struct work_struct paprd_work;
-+      struct completion paprd_complete;
-+      int paprd_txok;
-       u32 intrstatus;
-       u32 sc_flags; /* SC_OP_* */
-@@ -613,7 +620,6 @@ struct ath_wiphy {
- void ath9k_tasklet(unsigned long data);
- int ath_reset(struct ath_softc *sc, bool retry_tx);
--int ath_get_hal_qnum(u16 queue, struct ath_softc *sc);
- int ath_get_mac80211_qnum(u32 queue, struct ath_softc *sc);
- int ath_cabq_update(struct ath_softc *);
-@@ -629,8 +635,6 @@ irqreturn_t ath_isr(int irq, void *dev);
- int ath9k_init_device(u16 devid, struct ath_softc *sc, u16 subsysid,
-                   const struct ath_bus_ops *bus_ops);
- void ath9k_deinit_device(struct ath_softc *sc);
--const char *ath_mac_bb_name(u32 mac_bb_version);
--const char *ath_rf_name(u16 rf_version);
- void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
- void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw,
-                          struct ath9k_channel *ichan);
-@@ -681,8 +685,6 @@ void ath9k_set_wiphy_idle(struct ath_wip
- void ath_mac80211_stop_queue(struct ath_softc *sc, u16 skb_queue);
- void ath_mac80211_start_queue(struct ath_softc *sc, u16 skb_queue);
--int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype);
--
- void ath_start_rfkill_poll(struct ath_softc *sc);
- extern void ath9k_rfkill_poll_state(struct ieee80211_hw *hw);
---- a/drivers/net/wireless/ath/ath9k/eeprom.h
-+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
-@@ -263,7 +263,8 @@ enum eeprom_param {
-       EEP_PWR_TABLE_OFFSET,
-       EEP_DRIVE_STRENGTH,
-       EEP_INTERNAL_REGULATOR,
--      EEP_SWREG
-+      EEP_SWREG,
-+      EEP_PAPRD,
- };
- enum ar5416_rates {
---- a/drivers/net/wireless/ath/ath9k/hw.c
-+++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2246,6 +2246,8 @@ int ath9k_hw_fill_cap_info(struct ath_hw
-               pCap->rx_status_len = sizeof(struct ar9003_rxs);
-               pCap->tx_desc_len = sizeof(struct ar9003_txc);
-               pCap->txs_len = sizeof(struct ar9003_txs);
-+              if (ah->eep_ops->get_eeprom(ah, EEP_PAPRD))
-+                      pCap->hw_caps |= ATH9K_HW_CAP_PAPRD;
-       } else {
-               pCap->tx_desc_len = sizeof(struct ath_desc);
-               if (AR_SREV_9280_20(ah) &&
---- a/drivers/net/wireless/ath/ath9k/hw.h
-+++ b/drivers/net/wireless/ath/ath9k/hw.h
-@@ -158,6 +158,9 @@
- #define ATH9K_HW_RX_HP_QDEPTH 16
- #define ATH9K_HW_RX_LP_QDEPTH 128
-+#define PAPRD_GAIN_TABLE_ENTRIES    32
-+#define PAPRD_TABLE_SZ              24
-+
- enum ath_ini_subsys {
-       ATH_INI_PRE = 0,
-       ATH_INI_CORE,
-@@ -200,6 +203,7 @@ enum ath9k_hw_caps {
-       ATH9K_HW_CAP_LDPC                       = BIT(19),
-       ATH9K_HW_CAP_FASTCLOCK                  = BIT(20),
-       ATH9K_HW_CAP_SGI_20                     = BIT(21),
-+      ATH9K_HW_CAP_PAPRD                      = BIT(22),
- };
- enum ath9k_capability_type {
-@@ -359,6 +363,9 @@ struct ath9k_channel {
-       int8_t iCoff;
-       int8_t qCoff;
-       int16_t rawNoiseFloor;
-+      bool paprd_done;
-+      u16 small_signal_gain[AR9300_MAX_CHAINS];
-+      u32 pa_table[AR9300_MAX_CHAINS][PAPRD_TABLE_SZ];
- };
- #define IS_CHAN_G(_c) ((((_c)->channelFlags & (CHANNEL_G)) == CHANNEL_G) || \
-@@ -793,6 +800,9 @@ struct ath_hw {
-       u32 bb_watchdog_last_status;
-       u32 bb_watchdog_timeout_ms; /* in ms, 0 to disable */
-+
-+      u32 paprd_gain_table_entries[PAPRD_GAIN_TABLE_ENTRIES];
-+      u8 paprd_gain_table_index[PAPRD_GAIN_TABLE_ENTRIES];
- };
- static inline struct ath_common *ath9k_hw_common(struct ath_hw *ah)
-@@ -922,6 +932,15 @@ void ar9003_hw_set_nf_limits(struct ath_
- void ar9003_hw_bb_watchdog_config(struct ath_hw *ah);
- void ar9003_hw_bb_watchdog_read(struct ath_hw *ah);
- void ar9003_hw_bb_watchdog_dbg_info(struct ath_hw *ah);
-+void ar9003_paprd_enable(struct ath_hw *ah, bool val);
-+void ar9003_paprd_populate_single_table(struct ath_hw *ah,
-+                                      struct ath9k_channel *chan, int chain);
-+int ar9003_paprd_create_curve(struct ath_hw *ah, struct ath9k_channel *chan,
-+                            int chain);
-+int ar9003_paprd_setup_gain_table(struct ath_hw *ah, int chain);
-+int ar9003_paprd_init_table(struct ath_hw *ah);
-+bool ar9003_paprd_is_done(struct ath_hw *ah);
-+void ar9003_hw_set_paprd_txdesc(struct ath_hw *ah, void *ds, u8 chains);
- /* Hardware family op attach helpers */
- void ar5008_hw_attach_phy_ops(struct ath_hw *ah);
---- a/drivers/net/wireless/ath/ath9k/init.c
-+++ b/drivers/net/wireless/ath/ath9k/init.c
-@@ -427,7 +427,7 @@ static int ath9k_init_btcoex(struct ath_
-               r = ath_init_btcoex_timer(sc);
-               if (r)
-                       return -1;
--              qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
-+              qnum = sc->tx.hwq_map[WME_AC_BE];
-               ath9k_hw_init_btcoex_hw(sc->sc_ah, qnum);
-               sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-               break;
-@@ -464,23 +464,23 @@ static int ath9k_init_queues(struct ath_
-       sc->config.cabqReadytime = ATH_CABQ_READY_TIME;
-       ath_cabq_update(sc);
--      if (!ath_tx_setup(sc, ATH9K_WME_AC_BK)) {
-+      if (!ath_tx_setup(sc, WME_AC_BK)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for BK traffic\n");
-               goto err;
-       }
--      if (!ath_tx_setup(sc, ATH9K_WME_AC_BE)) {
-+      if (!ath_tx_setup(sc, WME_AC_BE)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for BE traffic\n");
-               goto err;
-       }
--      if (!ath_tx_setup(sc, ATH9K_WME_AC_VI)) {
-+      if (!ath_tx_setup(sc, WME_AC_VI)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for VI traffic\n");
-               goto err;
-       }
--      if (!ath_tx_setup(sc, ATH9K_WME_AC_VO)) {
-+      if (!ath_tx_setup(sc, WME_AC_VO)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for VO traffic\n");
-               goto err;
-@@ -769,6 +769,7 @@ int ath9k_init_device(u16 devid, struct 
-                       goto error_world;
-       }
-+      INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
-       INIT_WORK(&sc->chan_work, ath9k_wiphy_chan_work);
-       INIT_DELAYED_WORK(&sc->wiphy_work, ath9k_wiphy_work);
-       sc->wiphy_scheduler_int = msecs_to_jiffies(500);
---- a/drivers/net/wireless/ath/ath9k/main.c
-+++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -233,6 +233,104 @@ int ath_set_channel(struct ath_softc *sc
-       return r;
- }
-+static void ath_paprd_activate(struct ath_softc *sc)
-+{
-+      struct ath_hw *ah = sc->sc_ah;
-+      int chain;
-+
-+      if (!ah->curchan->paprd_done)
-+              return;
-+
-+      ath9k_ps_wakeup(sc);
-+      for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-+              if (!(ah->caps.tx_chainmask & BIT(chain)))
-+                      continue;
-+
-+              ar9003_paprd_populate_single_table(ah, ah->curchan, chain);
-+      }
-+
-+      ar9003_paprd_enable(ah, true);
-+      ath9k_ps_restore(sc);
-+}
-+
-+void ath_paprd_calibrate(struct work_struct *work)
-+{
-+      struct ath_softc *sc = container_of(work, struct ath_softc, paprd_work);
-+      struct ieee80211_hw *hw = sc->hw;
-+      struct ath_hw *ah = sc->sc_ah;
-+      struct ieee80211_hdr *hdr;
-+      struct sk_buff *skb = NULL;
-+      struct ieee80211_tx_info *tx_info;
-+      int band = hw->conf.channel->band;
-+      struct ieee80211_supported_band *sband = &sc->sbands[band];
-+      struct ath_tx_control txctl;
-+      int qnum, ftype;
-+      int chain_ok = 0;
-+      int chain;
-+      int len = 1800;
-+      int i;
-+
-+      ath9k_ps_wakeup(sc);
-+      skb = alloc_skb(len, GFP_KERNEL);
-+      if (!skb)
-+              return;
-+
-+      tx_info = IEEE80211_SKB_CB(skb);
-+
-+      skb_put(skb, len);
-+      memset(skb->data, 0, len);
-+      hdr = (struct ieee80211_hdr *)skb->data;
-+      ftype = IEEE80211_FTYPE_DATA | IEEE80211_STYPE_NULLFUNC;
-+      hdr->frame_control = cpu_to_le16(ftype);
-+      hdr->duration_id = 10;
-+      memcpy(hdr->addr1, hw->wiphy->perm_addr, ETH_ALEN);
-+      memcpy(hdr->addr2, hw->wiphy->perm_addr, ETH_ALEN);
-+      memcpy(hdr->addr3, hw->wiphy->perm_addr, ETH_ALEN);
-+
-+      memset(&txctl, 0, sizeof(txctl));
-+      qnum = sc->tx.hwq_map[WME_AC_BE];
-+      txctl.txq = &sc->tx.txq[qnum];
-+
-+      ar9003_paprd_init_table(ah);
-+      for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) {
-+              if (!(ah->caps.tx_chainmask & BIT(chain)))
-+                      continue;
-+
-+              chain_ok = 0;
-+              memset(tx_info, 0, sizeof(*tx_info));
-+              tx_info->band = band;
-+
-+              for (i = 0; i < 4; i++) {
-+                      tx_info->control.rates[i].idx = sband->n_bitrates - 1;
-+                      tx_info->control.rates[i].count = 6;
-+              }
-+
-+              init_completion(&sc->paprd_complete);
-+              ar9003_paprd_setup_gain_table(ah, chain);
-+              txctl.paprd = BIT(chain);
-+              if (ath_tx_start(hw, skb, &txctl) != 0)
-+                      break;
-+
-+              wait_for_completion(&sc->paprd_complete);
-+
-+              if (!ar9003_paprd_is_done(ah))
-+                      break;
-+
-+              if (ar9003_paprd_create_curve(ah, ah->curchan, chain) != 0)
-+                      break;
-+
-+              chain_ok = 1;
-+      }
-+      kfree_skb(skb);
-+
-+      if (chain_ok) {
-+              ah->curchan->paprd_done = true;
-+              ath_paprd_activate(sc);
-+      }
-+
-+      ath9k_ps_restore(sc);
-+}
-+
- /*
-  *  This routine performs the periodic noise floor calibration function
-  *  that is used to adjust and optimize the chip performance.  This
-@@ -332,6 +430,13 @@ set_timer:
-               cal_interval = min(cal_interval, (u32)short_cal_interval);
-       mod_timer(&common->ani.timer, jiffies + msecs_to_jiffies(cal_interval));
-+      if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_PAPRD) &&
-+          !(sc->sc_flags & SC_OP_SCANNING)) {
-+              if (!sc->sc_ah->curchan->paprd_done)
-+                      ieee80211_queue_work(sc->hw, &sc->paprd_work);
-+              else
-+                      ath_paprd_activate(sc);
-+      }
- }
- static void ath_start_ani(struct ath_common *common)
-@@ -805,25 +910,25 @@ int ath_reset(struct ath_softc *sc, bool
-       return r;
- }
--int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
-+static int ath_get_hal_qnum(u16 queue, struct ath_softc *sc)
- {
-       int qnum;
-       switch (queue) {
-       case 0:
--              qnum = sc->tx.hwq_map[ATH9K_WME_AC_VO];
-+              qnum = sc->tx.hwq_map[WME_AC_VO];
-               break;
-       case 1:
--              qnum = sc->tx.hwq_map[ATH9K_WME_AC_VI];
-+              qnum = sc->tx.hwq_map[WME_AC_VI];
-               break;
-       case 2:
--              qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
-+              qnum = sc->tx.hwq_map[WME_AC_BE];
-               break;
-       case 3:
--              qnum = sc->tx.hwq_map[ATH9K_WME_AC_BK];
-+              qnum = sc->tx.hwq_map[WME_AC_BK];
-               break;
-       default:
--              qnum = sc->tx.hwq_map[ATH9K_WME_AC_BE];
-+              qnum = sc->tx.hwq_map[WME_AC_BE];
-               break;
-       }
-@@ -835,16 +940,16 @@ int ath_get_mac80211_qnum(u32 queue, str
-       int qnum;
-       switch (queue) {
--      case ATH9K_WME_AC_VO:
-+      case WME_AC_VO:
-               qnum = 0;
-               break;
--      case ATH9K_WME_AC_VI:
-+      case WME_AC_VI:
-               qnum = 1;
-               break;
--      case ATH9K_WME_AC_BE:
-+      case WME_AC_BE:
-               qnum = 2;
-               break;
--      case ATH9K_WME_AC_BK:
-+      case WME_AC_BK:
-               qnum = 3;
-               break;
-       default:
-@@ -1128,6 +1233,7 @@ static void ath9k_stop(struct ieee80211_
-       cancel_delayed_work_sync(&sc->ath_led_blink_work);
-       cancel_delayed_work_sync(&sc->tx_complete_work);
-+      cancel_work_sync(&sc->paprd_work);
-       if (!sc->num_sec_wiphy) {
-               cancel_delayed_work_sync(&sc->wiphy_work);
-@@ -1556,7 +1662,7 @@ static int ath9k_conf_tx(struct ieee8021
-               ath_print(common, ATH_DBG_FATAL, "TXQ Update failed\n");
-       if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC)
--              if ((qnum == sc->tx.hwq_map[ATH9K_WME_AC_BE]) && !ret)
-+              if ((qnum == sc->tx.hwq_map[WME_AC_BE]) && !ret)
-                       ath_beaconq_config(sc);
-       mutex_unlock(&sc->mutex);
-@@ -1843,6 +1949,7 @@ static void ath9k_sw_scan_start(struct i
-       ath9k_wiphy_pause_all_forced(sc, aphy);
-       sc->sc_flags |= SC_OP_SCANNING;
-       del_timer_sync(&common->ani.timer);
-+      cancel_work_sync(&sc->paprd_work);
-       cancel_delayed_work_sync(&sc->tx_complete_work);
-       mutex_unlock(&sc->mutex);
- }
---- a/drivers/net/wireless/ath/ath9k/xmit.c
-+++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -941,6 +941,7 @@ struct ath_txq *ath_txq_setup(struct ath
-       if (!ATH_TXQ_SETUP(sc, qnum)) {
-               struct ath_txq *txq = &sc->tx.txq[qnum];
-+              txq->axq_class = subtype;
-               txq->axq_qnum = qnum;
-               txq->axq_link = NULL;
-               INIT_LIST_HEAD(&txq->axq_q);
-@@ -958,32 +959,6 @@ struct ath_txq *ath_txq_setup(struct ath
-       return &sc->tx.txq[qnum];
- }
--int ath_tx_get_qnum(struct ath_softc *sc, int qtype, int haltype)
--{
--      int qnum;
--
--      switch (qtype) {
--      case ATH9K_TX_QUEUE_DATA:
--              if (haltype >= ARRAY_SIZE(sc->tx.hwq_map)) {
--                      ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
--                                "HAL AC %u out of range, max %zu!\n",
--                                haltype, ARRAY_SIZE(sc->tx.hwq_map));
--                      return -1;
--              }
--              qnum = sc->tx.hwq_map[haltype];
--              break;
--      case ATH9K_TX_QUEUE_BEACON:
--              qnum = sc->beacon.beaconq;
--              break;
--      case ATH9K_TX_QUEUE_CAB:
--              qnum = sc->beacon.cabq->axq_qnum;
--              break;
--      default:
--              qnum = -1;
--      }
--      return qnum;
--}
--
- int ath_txq_update(struct ath_softc *sc, int qnum,
-                  struct ath9k_tx_queue_info *qinfo)
- {
-@@ -1662,12 +1637,13 @@ static int ath_tx_setup_buffer(struct ie
-               bf->bf_frmlen -= padsize;
-       }
--      if (conf_is_ht(&hw->conf)) {
-+      if (!txctl->paprd && conf_is_ht(&hw->conf)) {
-               bf->bf_state.bf_type |= BUF_HT;
-               if (tx_info->flags & IEEE80211_TX_CTL_LDPC)
-                       use_ldpc = true;
-       }
-+      bf->bf_state.bfs_paprd = txctl->paprd;
-       bf->bf_flags = setup_tx_flags(skb, use_ldpc);
-       bf->bf_keytype = get_hw_crypto_keytype(skb);
-@@ -1742,6 +1718,9 @@ static void ath_tx_start_dma(struct ath_
-                           bf->bf_buf_addr,
-                           txctl->txq->axq_qnum);
-+      if (bf->bf_state.bfs_paprd)
-+              ar9003_hw_set_paprd_txdesc(ah, ds, bf->bf_state.bfs_paprd);
-+
-       spin_lock_bh(&txctl->txq->axq_lock);
-       if (bf_isht(bf) && (sc->sc_flags & SC_OP_TXAGGR) &&
-@@ -1785,7 +1764,7 @@ int ath_tx_start(struct ieee80211_hw *hw
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       struct ath_txq *txq = txctl->txq;
-       struct ath_buf *bf;
--      int r;
-+      int q, r;
-       bf = ath_tx_get_buffer(sc);
-       if (!bf) {
-@@ -1793,14 +1772,6 @@ int ath_tx_start(struct ieee80211_hw *hw
-               return -1;
-       }
--      bf->txq = txctl->txq;
--      spin_lock_bh(&bf->txq->axq_lock);
--      if (++bf->txq->pending_frames > ATH_MAX_QDEPTH && !txq->stopped) {
--              ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
--              txq->stopped = 1;
--      }
--      spin_unlock_bh(&bf->txq->axq_lock);
--
-       r = ath_tx_setup_buffer(hw, bf, skb, txctl);
-       if (unlikely(r)) {
-               ath_print(common, ATH_DBG_FATAL, "TX mem alloc failure\n");
-@@ -1821,6 +1792,17 @@ int ath_tx_start(struct ieee80211_hw *hw
-               return r;
-       }
-+      q = skb_get_queue_mapping(skb);
-+      if (q >= 4)
-+              q = 0;
-+
-+      spin_lock_bh(&txq->axq_lock);
-+      if (++sc->tx.pending_frames[q] > ATH_MAX_QDEPTH && !txq->stopped) {
-+              ath_mac80211_stop_queue(sc, skb_get_queue_mapping(skb));
-+              txq->stopped = 1;
-+      }
-+      spin_unlock_bh(&txq->axq_lock);
-+
-       ath_tx_start_dma(sc, bf, txctl);
-       return 0;
-@@ -1890,7 +1872,7 @@ static void ath_tx_complete(struct ath_s
-       struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-       struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-       struct ieee80211_hdr * hdr = (struct ieee80211_hdr *)skb->data;
--      int padpos, padsize;
-+      int q, padpos, padsize;
-       ath_print(common, ATH_DBG_XMIT, "TX complete: skb: %p\n", skb);
-@@ -1929,8 +1911,16 @@ static void ath_tx_complete(struct ath_s
-       if (unlikely(tx_info->pad[0] & ATH_TX_INFO_FRAME_TYPE_INTERNAL))
-               ath9k_tx_status(hw, skb);
--      else
-+      else {
-+              q = skb_get_queue_mapping(skb);
-+              if (q >= 4)
-+                      q = 0;
-+
-+              if (--sc->tx.pending_frames[q] < 0)
-+                      sc->tx.pending_frames[q] = 0;
-+
-               ieee80211_tx_status(hw, skb);
-+      }
- }
- static void ath_tx_complete_buf(struct ath_softc *sc, struct ath_buf *bf,
-@@ -1951,16 +1941,15 @@ static void ath_tx_complete_buf(struct a
-                       tx_flags |= ATH_TX_XRETRY;
-       }
--      if (bf->txq) {
--              spin_lock_bh(&bf->txq->axq_lock);
--              bf->txq->pending_frames--;
--              spin_unlock_bh(&bf->txq->axq_lock);
--              bf->txq = NULL;
--      }
--
-       dma_unmap_single(sc->dev, bf->bf_dmacontext, skb->len, DMA_TO_DEVICE);
--      ath_tx_complete(sc, skb, bf->aphy, tx_flags);
--      ath_debug_stat_tx(sc, txq, bf, ts);
-+
-+      if (bf->bf_state.bfs_paprd) {
-+              sc->paprd_txok = txok;
-+              complete(&sc->paprd_complete);
-+      } else {
-+              ath_tx_complete(sc, skb, bf->aphy, tx_flags);
-+              ath_debug_stat_tx(sc, txq, bf, ts);
-+      }
-       /*
-        * Return the list of ath_buf of this mpdu to free queue
-@@ -2045,13 +2034,14 @@ static void ath_wake_mac80211_queue(stru
- {
-       int qnum;
-+      qnum = ath_get_mac80211_qnum(txq->axq_class, sc);
-+      if (qnum == -1)
-+              return;
-+
-       spin_lock_bh(&txq->axq_lock);
--      if (txq->stopped && txq->pending_frames < ATH_MAX_QDEPTH) {
--              qnum = ath_get_mac80211_qnum(txq->axq_qnum, sc);
--              if (qnum != -1) {
--                      ath_mac80211_start_queue(sc, qnum);
--                      txq->stopped = 0;
--              }
-+      if (txq->stopped && sc->tx.pending_frames[qnum] < ATH_MAX_QDEPTH) {
-+              ath_mac80211_start_queue(sc, qnum);
-+              txq->stopped = 0;
-       }
-       spin_unlock_bh(&txq->axq_lock);
- }
-@@ -2422,26 +2412,8 @@ void ath_tx_node_init(struct ath_softc *
-       for (acno = 0, ac = &an->ac[acno];
-            acno < WME_NUM_AC; acno++, ac++) {
-               ac->sched    = false;
-+              ac->qnum = sc->tx.hwq_map[acno];
-               INIT_LIST_HEAD(&ac->tid_q);
--
--              switch (acno) {
--              case WME_AC_BE:
--                      ac->qnum = ath_tx_get_qnum(sc,
--                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BE);
--                      break;
--              case WME_AC_BK:
--                      ac->qnum = ath_tx_get_qnum(sc,
--                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_BK);
--                      break;
--              case WME_AC_VI:
--                      ac->qnum = ath_tx_get_qnum(sc,
--                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VI);
--                      break;
--              case WME_AC_VO:
--                      ac->qnum = ath_tx_get_qnum(sc,
--                                 ATH9K_TX_QUEUE_DATA, ATH9K_WME_AC_VO);
--                      break;
--              }
-       }
- }
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -38,8 +38,7 @@ int ath_beaconq_config(struct ath_softc 
-               qi.tqi_cwmax = 0;
-       } else {
-               /* Adhoc mode; important thing is to use 2x cwmin. */
--              qnum = ath_tx_get_qnum(sc, ATH9K_TX_QUEUE_DATA,
--                                     ATH9K_WME_AC_BE);
-+              qnum = sc->tx.hwq_map[WME_AC_BE];
-               ath9k_hw_get_txq_props(ah, qnum, &qi_be);
-               qi.tqi_aifs = qi_be.tqi_aifs;
-               qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
---- a/drivers/net/wireless/ath/ath9k/debug.c
-+++ b/drivers/net/wireless/ath/ath9k/debug.c
-@@ -630,10 +630,10 @@ static const struct file_operations fops
-       do {                                                            \
-               len += snprintf(buf + len, size - len,                  \
-                               "%s%13u%11u%10u%10u\n", str,            \
--              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BE]].elem, \
--              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_BK]].elem, \
--              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VI]].elem, \
--              sc->debug.stats.txstats[sc->tx.hwq_map[ATH9K_WME_AC_VO]].elem); \
-+              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BE]].elem, \
-+              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_BK]].elem, \
-+              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VI]].elem, \
-+              sc->debug.stats.txstats[sc->tx.hwq_map[WME_AC_VO]].elem); \
- } while(0)
- static ssize_t read_file_xmit(struct file *file, char __user *user_buf,
-@@ -956,6 +956,10 @@ int ath9k_init_debug(struct ath_hw *ah)
-                       sc->debug.debugfs_phy, sc, &fops_regval))
-               goto err;
-+      if (!debugfs_create_bool("ignore_extcca", S_IRUSR | S_IWUSR,
-+                      sc->debug.debugfs_phy, &ah->config.cwm_ignore_extcca))
-+              goto err;
-+
-       sc->debug.regidx = 0;
-       return 0;
- err:
---- a/drivers/net/wireless/ath/ath9k/htc.h
-+++ b/drivers/net/wireless/ath/ath9k/htc.h
-@@ -398,7 +398,7 @@ struct ath9k_htc_priv {
-       int beaconq;
-       int cabq;
--      int hwq_map[ATH9K_WME_AC_VO+1];
-+      int hwq_map[WME_NUM_AC];
- #ifdef CONFIG_ATH9K_HTC_DEBUGFS
-       struct ath9k_debug debug;
---- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
-@@ -227,7 +227,7 @@ void ath9k_htc_beaconq_config(struct ath
- {
-       struct ath_hw *ah = priv->ah;
-       struct ath9k_tx_queue_info qi, qi_be;
--      int qnum = priv->hwq_map[ATH9K_WME_AC_BE];
-+      int qnum = priv->hwq_map[WME_AC_BE];
-       memset(&qi, 0, sizeof(struct ath9k_tx_queue_info));
-       memset(&qi_be, 0, sizeof(struct ath9k_tx_queue_info));
---- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
-@@ -521,23 +521,23 @@ static int ath9k_init_queues(struct ath9
-               goto err;
-       }
--      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BE)) {
-+      if (!ath9k_htc_txq_setup(priv, WME_AC_BE)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for BE traffic\n");
-               goto err;
-       }
--      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_BK)) {
-+      if (!ath9k_htc_txq_setup(priv, WME_AC_BK)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for BK traffic\n");
-               goto err;
-       }
--      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VI)) {
-+      if (!ath9k_htc_txq_setup(priv, WME_AC_VI)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for VI traffic\n");
-               goto err;
-       }
--      if (!ath9k_htc_txq_setup(priv, ATH9K_WME_AC_VO)) {
-+      if (!ath9k_htc_txq_setup(priv, WME_AC_VO)) {
-               ath_print(common, ATH_DBG_FATAL,
-                         "Unable to setup xmit queue for VO traffic\n");
-               goto err;
---- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c
-@@ -1590,7 +1590,7 @@ static int ath9k_htc_conf_tx(struct ieee
-       }
-       if ((priv->ah->opmode == NL80211_IFTYPE_ADHOC) &&
--          (qnum == priv->hwq_map[ATH9K_WME_AC_BE]))
-+          (qnum == priv->hwq_map[WME_AC_BE]))
-                   ath9k_htc_beaconq_config(priv);
- out:
-       ath9k_htc_ps_restore(priv);
---- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-+++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
-@@ -34,15 +34,15 @@ int get_hw_qnum(u16 queue, int *hwq_map)
- {
-       switch (queue) {
-       case 0:
--              return hwq_map[ATH9K_WME_AC_VO];
-+              return hwq_map[WME_AC_VO];
-       case 1:
--              return hwq_map[ATH9K_WME_AC_VI];
-+              return hwq_map[WME_AC_VI];
-       case 2:
--              return hwq_map[ATH9K_WME_AC_BE];
-+              return hwq_map[WME_AC_BE];
-       case 3:
--              return hwq_map[ATH9K_WME_AC_BK];
-+              return hwq_map[WME_AC_BK];
-       default:
--              return hwq_map[ATH9K_WME_AC_BE];
-+              return hwq_map[WME_AC_BE];
-       }
- }
---- a/drivers/net/wireless/ath/ath9k/mac.h
-+++ b/drivers/net/wireless/ath/ath9k/mac.h
-@@ -577,13 +577,8 @@ enum ath9k_tx_queue {
- #define       ATH9K_NUM_TX_QUEUES 10
--enum ath9k_tx_queue_subtype {
--      ATH9K_WME_AC_BK = 0,
--      ATH9K_WME_AC_BE,
--      ATH9K_WME_AC_VI,
--      ATH9K_WME_AC_VO,
--      ATH9K_WME_UPSD
--};
-+/* Used as a queue subtype instead of a WMM AC */
-+#define ATH9K_WME_UPSD        4
- enum ath9k_tx_queue_flags {
-       TXQ_FLAG_TXOKINT_ENABLE = 0x0001,
-@@ -617,7 +612,7 @@ enum ath9k_pkt_type {
- struct ath9k_tx_queue_info {
-       u32 tqi_ver;
-       enum ath9k_tx_queue tqi_type;
--      enum ath9k_tx_queue_subtype tqi_subtype;
-+      int tqi_subtype;
-       enum ath9k_tx_queue_flags tqi_qflags;
-       u32 tqi_priority;
-       u32 tqi_aifs;
---- a/drivers/net/wireless/ath/ath9k/virtual.c
-+++ b/drivers/net/wireless/ath/ath9k/virtual.c
-@@ -219,7 +219,7 @@ static int ath9k_send_nullfunc(struct at
-       info->control.rates[1].idx = -1;
-       memset(&txctl, 0, sizeof(struct ath_tx_control));
--      txctl.txq = &sc->tx.txq[sc->tx.hwq_map[ATH9K_WME_AC_VO]];
-+      txctl.txq = &sc->tx.txq[sc->tx.hwq_map[WME_AC_VO]];
-       txctl.frame_type = ps ? ATH9K_IFT_PAUSE : ATH9K_IFT_UNPAUSE;
-       if (ath_tx_start(aphy->hw, skb, &txctl) != 0)
diff --git a/package/mac80211/patches/520-ath9k_enable_ar9300.patch b/package/mac80211/patches/520-ath9k_enable_ar9300.patch
deleted file mode 100644 (file)
index f8fbe86..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/drivers/net/wireless/ath/ath9k/pci.c
-+++ b/drivers/net/wireless/ath/ath9k/pci.c
-@@ -29,6 +29,7 @@ static DEFINE_PCI_DEVICE_TABLE(ath_pci_i
-       { PCI_VDEVICE(ATHEROS, 0x002C) }, /* PCI-E 802.11n bonded out */
-       { PCI_VDEVICE(ATHEROS, 0x002D) }, /* PCI   */
-       { PCI_VDEVICE(ATHEROS, 0x002E) }, /* PCI-E */
-+      { PCI_VDEVICE(ATHEROS, 0x0030) }, /* PCI-E  AR9300 */
-       { 0 }
- };
diff --git a/package/mac80211/patches/520-initval_rename.patch b/package/mac80211/patches/520-initval_rename.patch
new file mode 100644 (file)
index 0000000..0a2760d
--- /dev/null
@@ -0,0 +1,59 @@
+--- a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
+@@ -1217,7 +1217,7 @@ static const u32 ar5416Addac_9160[][2] =
+     {0x000098cc,  0x00000000 },
+ };
+-static const u32 ar5416Addac_91601_1[][2] = {
++static const u32 ar5416Addac_9160_1_1[][2] = {
+     {0x0000989c,  0x00000000 },
+     {0x0000989c,  0x00000000 },
+     {0x0000989c,  0x00000000 },
+--- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
++++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
+@@ -179,8 +179,8 @@ static void ar9002_hw_init_mode_regs(str
+                              ARRAY_SIZE(ar5416Bank7_9160), 2);
+               if (AR_SREV_9160_11(ah)) {
+                       INIT_INI_ARRAY(&ah->iniAddac,
+-                                     ar5416Addac_91601_1,
+-                                     ARRAY_SIZE(ar5416Addac_91601_1), 2);
++                                     ar5416Addac_9160_1_1,
++                                     ARRAY_SIZE(ar5416Addac_9160_1_1), 2);
+               } else {
+                       INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9160,
+                                      ARRAY_SIZE(ar5416Addac_9160), 2);
+@@ -239,12 +239,12 @@ void ar9002_hw_cck_chan14_spread(struct 
+ {
+       if (AR_SREV_9287_11_OR_LATER(ah)) {
+               INIT_INI_ARRAY(&ah->iniCckfirNormal,
+-                     ar9287Common_normal_cck_fir_coeff_92871_1,
+-                     ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_92871_1),
++                     ar9287Common_normal_cck_fir_coeff_9287_1_1,
++                     ARRAY_SIZE(ar9287Common_normal_cck_fir_coeff_9287_1_1),
+                      2);
+               INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
+-                     ar9287Common_japan_2484_cck_fir_coeff_92871_1,
+-                     ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_92871_1),
++                     ar9287Common_japan_2484_cck_fir_coeff_9287_1_1,
++                     ARRAY_SIZE(ar9287Common_japan_2484_cck_fir_coeff_9287_1_1),
+                      2);
+       }
+ }
+--- a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
+@@ -4142,13 +4142,13 @@ static const u32 ar9287Common_9287_1_1[]
+  * registers be programmed differently from the channel between 2412 and
+  * 2472 MHz.
+  */
+-static const u32 ar9287Common_normal_cck_fir_coeff_92871_1[][2] = {
++static const u32 ar9287Common_normal_cck_fir_coeff_9287_1_1[][2] = {
+     { 0x0000a1f4, 0x00fffeff },
+     { 0x0000a1f8, 0x00f5f9ff },
+     { 0x0000a1fc, 0xb79f6427 },
+ };
+-static const u32 ar9287Common_japan_2484_cck_fir_coeff_92871_1[][2] = {
++static const u32 ar9287Common_japan_2484_cck_fir_coeff_9287_1_1[][2] = {
+     { 0x0000a1f4, 0x00000000 },
+     { 0x0000a1f8, 0xefff0301 },
+     { 0x0000a1fc, 0xca9228ee },
diff --git a/package/mac80211/patches/521-initval_format_changes.patch b/package/mac80211/patches/521-initval_format_changes.patch
new file mode 100644 (file)
index 0000000..49bd62c
--- /dev/null
@@ -0,0 +1,14200 @@
+--- a/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar5008_initvals.h
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2008-2009 Atheros Communications Inc.
++ * Copyright (c) 2010 Atheros Communications Inc.
+  *
+  * Permission to use, copy, modify, and/or distribute this software for any
+  * purpose with or without fee is hereby granted, provided that the above
+@@ -14,729 +14,660 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+-#ifndef INITVALS_AR5008_H
+-#define INITVALS_AR5008_H
+-
+ static const u32 ar5416Modes[][6] = {
+-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
+-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
+-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
+-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
+-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
+-    { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf },
+-    { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 },
+-    { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a },
+-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
+-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
+-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
+-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
+-    { 0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0 },
+-    { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x00009850, 0x6c48b4e0, 0x6d48b4e0, 0x6d48b0de, 0x6c48b0de, 0x6c48b0de },
+-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e },
+-    { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e },
+-    { 0x00009860, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18 },
+-    { 0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
+-    { 0x00009868, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190 },
+-    { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 },
+-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
+-    { 0x00009918, 0x000001b8, 0x00000370, 0x00000268, 0x00000134, 0x00000134 },
+-    { 0x00009924, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b },
+-    { 0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020 },
+-    { 0x00009960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80 },
+-    { 0x0000a960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80 },
+-    { 0x0000b960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80 },
+-    { 0x00009964, 0x00000000, 0x00000000, 0x00001120, 0x00001120, 0x00001120 },
+-    { 0x000099bc, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00 },
+-    { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be },
+-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
+-    { 0x000099c8, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c },
+-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
+-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
+-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 },
+-    { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 },
+-    { 0x0000a20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000b20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000c20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
+-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
+-    { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa },
+-    { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 },
+-    { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 },
+-    { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 },
+-    { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b },
+-    { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b },
+-    { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a },
+-    { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf },
+-    { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f },
+-    { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f },
+-    { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f },
+-    { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
++      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
++      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
++      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
++      {0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},
++      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
++      {0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf},
++      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},
++      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a},
++      {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
++      {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
++      {0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
++      {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
++      {0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0},
++      {0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x00009850, 0x6c48b4e0, 0x6d48b4e0, 0x6d48b0de, 0x6c48b0de, 0x6c48b0de},
++      {0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},
++      {0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e},
++      {0x00009860, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18, 0x00049d18},
++      {0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
++      {0x00009868, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190},
++      {0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},
++      {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
++      {0x00009918, 0x000001b8, 0x00000370, 0x00000268, 0x00000134, 0x00000134},
++      {0x00009924, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b, 0xd0058a0b},
++      {0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020},
++      {0x00009960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},
++      {0x0000a960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},
++      {0x0000b960, 0x00000900, 0x00000900, 0x00012d80, 0x00012d80, 0x00012d80},
++      {0x00009964, 0x00000000, 0x00000000, 0x00001120, 0x00001120, 0x00001120},
++      {0x000099bc, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00, 0x001a0a00},
++      {0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be},
++      {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
++      {0x000099c8, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c, 0x6af6532c},
++      {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
++      {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
++      {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880},
++      {0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788},
++      {0x0000a20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000b20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000c20c, 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
++      {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
++      {0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa},
++      {0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000},
++      {0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402},
++      {0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06},
++      {0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b},
++      {0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b},
++      {0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a},
++      {0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf},
++      {0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f},
++      {0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f},
++      {0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f},
++      {0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ };
+ static const u32 ar5416Common[][2] = {
+-    { 0x0000000c, 0x00000000 },
+-    { 0x00000030, 0x00020015 },
+-    { 0x00000034, 0x00000005 },
+-    { 0x00000040, 0x00000000 },
+-    { 0x00000044, 0x00000008 },
+-    { 0x00000048, 0x00000008 },
+-    { 0x0000004c, 0x00000010 },
+-    { 0x00000050, 0x00000000 },
+-    { 0x00000054, 0x0000001f },
+-    { 0x00000800, 0x00000000 },
+-    { 0x00000804, 0x00000000 },
+-    { 0x00000808, 0x00000000 },
+-    { 0x0000080c, 0x00000000 },
+-    { 0x00000810, 0x00000000 },
+-    { 0x00000814, 0x00000000 },
+-    { 0x00000818, 0x00000000 },
+-    { 0x0000081c, 0x00000000 },
+-    { 0x00000820, 0x00000000 },
+-    { 0x00000824, 0x00000000 },
+-    { 0x00001040, 0x002ffc0f },
+-    { 0x00001044, 0x002ffc0f },
+-    { 0x00001048, 0x002ffc0f },
+-    { 0x0000104c, 0x002ffc0f },
+-    { 0x00001050, 0x002ffc0f },
+-    { 0x00001054, 0x002ffc0f },
+-    { 0x00001058, 0x002ffc0f },
+-    { 0x0000105c, 0x002ffc0f },
+-    { 0x00001060, 0x002ffc0f },
+-    { 0x00001064, 0x002ffc0f },
+-    { 0x00001230, 0x00000000 },
+-    { 0x00001270, 0x00000000 },
+-    { 0x00001038, 0x00000000 },
+-    { 0x00001078, 0x00000000 },
+-    { 0x000010b8, 0x00000000 },
+-    { 0x000010f8, 0x00000000 },
+-    { 0x00001138, 0x00000000 },
+-    { 0x00001178, 0x00000000 },
+-    { 0x000011b8, 0x00000000 },
+-    { 0x000011f8, 0x00000000 },
+-    { 0x00001238, 0x00000000 },
+-    { 0x00001278, 0x00000000 },
+-    { 0x000012b8, 0x00000000 },
+-    { 0x000012f8, 0x00000000 },
+-    { 0x00001338, 0x00000000 },
+-    { 0x00001378, 0x00000000 },
+-    { 0x000013b8, 0x00000000 },
+-    { 0x000013f8, 0x00000000 },
+-    { 0x00001438, 0x00000000 },
+-    { 0x00001478, 0x00000000 },
+-    { 0x000014b8, 0x00000000 },
+-    { 0x000014f8, 0x00000000 },
+-    { 0x00001538, 0x00000000 },
+-    { 0x00001578, 0x00000000 },
+-    { 0x000015b8, 0x00000000 },
+-    { 0x000015f8, 0x00000000 },
+-    { 0x00001638, 0x00000000 },
+-    { 0x00001678, 0x00000000 },
+-    { 0x000016b8, 0x00000000 },
+-    { 0x000016f8, 0x00000000 },
+-    { 0x00001738, 0x00000000 },
+-    { 0x00001778, 0x00000000 },
+-    { 0x000017b8, 0x00000000 },
+-    { 0x000017f8, 0x00000000 },
+-    { 0x0000103c, 0x00000000 },
+-    { 0x0000107c, 0x00000000 },
+-    { 0x000010bc, 0x00000000 },
+-    { 0x000010fc, 0x00000000 },
+-    { 0x0000113c, 0x00000000 },
+-    { 0x0000117c, 0x00000000 },
+-    { 0x000011bc, 0x00000000 },
+-    { 0x000011fc, 0x00000000 },
+-    { 0x0000123c, 0x00000000 },
+-    { 0x0000127c, 0x00000000 },
+-    { 0x000012bc, 0x00000000 },
+-    { 0x000012fc, 0x00000000 },
+-    { 0x0000133c, 0x00000000 },
+-    { 0x0000137c, 0x00000000 },
+-    { 0x000013bc, 0x00000000 },
+-    { 0x000013fc, 0x00000000 },
+-    { 0x0000143c, 0x00000000 },
+-    { 0x0000147c, 0x00000000 },
+-    { 0x00004030, 0x00000002 },
+-    { 0x0000403c, 0x00000002 },
+-    { 0x00007010, 0x00000000 },
+-    { 0x00007038, 0x000004c2 },
+-    { 0x00008004, 0x00000000 },
+-    { 0x00008008, 0x00000000 },
+-    { 0x0000800c, 0x00000000 },
+-    { 0x00008018, 0x00000700 },
+-    { 0x00008020, 0x00000000 },
+-    { 0x00008038, 0x00000000 },
+-    { 0x0000803c, 0x00000000 },
+-    { 0x00008048, 0x40000000 },
+-    { 0x00008054, 0x00000000 },
+-    { 0x00008058, 0x00000000 },
+-    { 0x0000805c, 0x000fc78f },
+-    { 0x00008060, 0x0000000f },
+-    { 0x00008064, 0x00000000 },
+-    { 0x000080c0, 0x2a82301a },
+-    { 0x000080c4, 0x05dc01e0 },
+-    { 0x000080c8, 0x1f402710 },
+-    { 0x000080cc, 0x01f40000 },
+-    { 0x000080d0, 0x00001e00 },
+-    { 0x000080d4, 0x00000000 },
+-    { 0x000080d8, 0x00400000 },
+-    { 0x000080e0, 0xffffffff },
+-    { 0x000080e4, 0x0000ffff },
+-    { 0x000080e8, 0x003f3f3f },
+-    { 0x000080ec, 0x00000000 },
+-    { 0x000080f0, 0x00000000 },
+-    { 0x000080f4, 0x00000000 },
+-    { 0x000080f8, 0x00000000 },
+-    { 0x000080fc, 0x00020000 },
+-    { 0x00008100, 0x00020000 },
+-    { 0x00008104, 0x00000001 },
+-    { 0x00008108, 0x00000052 },
+-    { 0x0000810c, 0x00000000 },
+-    { 0x00008110, 0x00000168 },
+-    { 0x00008118, 0x000100aa },
+-    { 0x0000811c, 0x00003210 },
+-    { 0x00008124, 0x00000000 },
+-    { 0x00008128, 0x00000000 },
+-    { 0x0000812c, 0x00000000 },
+-    { 0x00008130, 0x00000000 },
+-    { 0x00008134, 0x00000000 },
+-    { 0x00008138, 0x00000000 },
+-    { 0x0000813c, 0x00000000 },
+-    { 0x00008144, 0xffffffff },
+-    { 0x00008168, 0x00000000 },
+-    { 0x0000816c, 0x00000000 },
+-    { 0x00008170, 0x32143320 },
+-    { 0x00008174, 0xfaa4fa50 },
+-    { 0x00008178, 0x00000100 },
+-    { 0x0000817c, 0x00000000 },
+-    { 0x000081c4, 0x00000000 },
+-    { 0x000081ec, 0x00000000 },
+-    { 0x000081f0, 0x00000000 },
+-    { 0x000081f4, 0x00000000 },
+-    { 0x000081f8, 0x00000000 },
+-    { 0x000081fc, 0x00000000 },
+-    { 0x00008200, 0x00000000 },
+-    { 0x00008204, 0x00000000 },
+-    { 0x00008208, 0x00000000 },
+-    { 0x0000820c, 0x00000000 },
+-    { 0x00008210, 0x00000000 },
+-    { 0x00008214, 0x00000000 },
+-    { 0x00008218, 0x00000000 },
+-    { 0x0000821c, 0x00000000 },
+-    { 0x00008220, 0x00000000 },
+-    { 0x00008224, 0x00000000 },
+-    { 0x00008228, 0x00000000 },
+-    { 0x0000822c, 0x00000000 },
+-    { 0x00008230, 0x00000000 },
+-    { 0x00008234, 0x00000000 },
+-    { 0x00008238, 0x00000000 },
+-    { 0x0000823c, 0x00000000 },
+-    { 0x00008240, 0x00100000 },
+-    { 0x00008244, 0x0010f400 },
+-    { 0x00008248, 0x00000100 },
+-    { 0x0000824c, 0x0001e800 },
+-    { 0x00008250, 0x00000000 },
+-    { 0x00008254, 0x00000000 },
+-    { 0x00008258, 0x00000000 },
+-    { 0x0000825c, 0x400000ff },
+-    { 0x00008260, 0x00080922 },
+-    { 0x00008264, 0x88000010 },
+-    { 0x00008270, 0x00000000 },
+-    { 0x00008274, 0x40000000 },
+-    { 0x00008278, 0x003e4180 },
+-    { 0x0000827c, 0x00000000 },
+-    { 0x00008284, 0x0000002c },
+-    { 0x00008288, 0x0000002c },
+-    { 0x0000828c, 0x00000000 },
+-    { 0x00008294, 0x00000000 },
+-    { 0x00008298, 0x00000000 },
+-    { 0x00008300, 0x00000000 },
+-    { 0x00008304, 0x00000000 },
+-    { 0x00008308, 0x00000000 },
+-    { 0x0000830c, 0x00000000 },
+-    { 0x00008310, 0x00000000 },
+-    { 0x00008314, 0x00000000 },
+-    { 0x00008318, 0x00000000 },
+-    { 0x00008328, 0x00000000 },
+-    { 0x0000832c, 0x00000007 },
+-    { 0x00008330, 0x00000302 },
+-    { 0x00008334, 0x00000e00 },
+-    { 0x00008338, 0x00070000 },
+-    { 0x0000833c, 0x00000000 },
+-    { 0x00008340, 0x000107ff },
+-    { 0x00009808, 0x00000000 },
+-    { 0x0000980c, 0xad848e19 },
+-    { 0x00009810, 0x7d14e000 },
+-    { 0x00009814, 0x9c0a9f6b },
+-    { 0x0000981c, 0x00000000 },
+-    { 0x0000982c, 0x0000a000 },
+-    { 0x00009830, 0x00000000 },
+-    { 0x0000983c, 0x00200400 },
+-    { 0x00009840, 0x206a002e },
+-    { 0x0000984c, 0x1284233c },
+-    { 0x00009854, 0x00000859 },
+-    { 0x00009900, 0x00000000 },
+-    { 0x00009904, 0x00000000 },
+-    { 0x00009908, 0x00000000 },
+-    { 0x0000990c, 0x00000000 },
+-    { 0x0000991c, 0x10000fff },
+-    { 0x00009920, 0x05100000 },
+-    { 0x0000a920, 0x05100000 },
+-    { 0x0000b920, 0x05100000 },
+-    { 0x00009928, 0x00000001 },
+-    { 0x0000992c, 0x00000004 },
+-    { 0x00009934, 0x1e1f2022 },
+-    { 0x00009938, 0x0a0b0c0d },
+-    { 0x0000993c, 0x00000000 },
+-    { 0x00009948, 0x9280b212 },
+-    { 0x0000994c, 0x00020028 },
+-    { 0x00009954, 0x5d50e188 },
+-    { 0x00009958, 0x00081fff },
+-    { 0x0000c95c, 0x004b6a8e },
+-    { 0x0000c968, 0x000003ce },
+-    { 0x00009970, 0x190fb515 },
+-    { 0x00009974, 0x00000000 },
+-    { 0x00009978, 0x00000001 },
+-    { 0x0000997c, 0x00000000 },
+-    { 0x00009980, 0x00000000 },
+-    { 0x00009984, 0x00000000 },
+-    { 0x00009988, 0x00000000 },
+-    { 0x0000998c, 0x00000000 },
+-    { 0x00009990, 0x00000000 },
+-    { 0x00009994, 0x00000000 },
+-    { 0x00009998, 0x00000000 },
+-    { 0x0000999c, 0x00000000 },
+-    { 0x000099a0, 0x00000000 },
+-    { 0x000099a4, 0x00000001 },
+-    { 0x000099a8, 0x001fff00 },
+-    { 0x000099ac, 0x00000000 },
+-    { 0x000099b0, 0x03051000 },
+-    { 0x000099dc, 0x00000000 },
+-    { 0x000099e0, 0x00000200 },
+-    { 0x000099e4, 0xaaaaaaaa },
+-    { 0x000099e8, 0x3c466478 },
+-    { 0x000099ec, 0x000000aa },
+-    { 0x000099fc, 0x00001042 },
+-    { 0x00009b00, 0x00000000 },
+-    { 0x00009b04, 0x00000001 },
+-    { 0x00009b08, 0x00000002 },
+-    { 0x00009b0c, 0x00000003 },
+-    { 0x00009b10, 0x00000004 },
+-    { 0x00009b14, 0x00000005 },
+-    { 0x00009b18, 0x00000008 },
+-    { 0x00009b1c, 0x00000009 },
+-    { 0x00009b20, 0x0000000a },
+-    { 0x00009b24, 0x0000000b },
+-    { 0x00009b28, 0x0000000c },
+-    { 0x00009b2c, 0x0000000d },
+-    { 0x00009b30, 0x00000010 },
+-    { 0x00009b34, 0x00000011 },
+-    { 0x00009b38, 0x00000012 },
+-    { 0x00009b3c, 0x00000013 },
+-    { 0x00009b40, 0x00000014 },
+-    { 0x00009b44, 0x00000015 },
+-    { 0x00009b48, 0x00000018 },
+-    { 0x00009b4c, 0x00000019 },
+-    { 0x00009b50, 0x0000001a },
+-    { 0x00009b54, 0x0000001b },
+-    { 0x00009b58, 0x0000001c },
+-    { 0x00009b5c, 0x0000001d },
+-    { 0x00009b60, 0x00000020 },
+-    { 0x00009b64, 0x00000021 },
+-    { 0x00009b68, 0x00000022 },
+-    { 0x00009b6c, 0x00000023 },
+-    { 0x00009b70, 0x00000024 },
+-    { 0x00009b74, 0x00000025 },
+-    { 0x00009b78, 0x00000028 },
+-    { 0x00009b7c, 0x00000029 },
+-    { 0x00009b80, 0x0000002a },
+-    { 0x00009b84, 0x0000002b },
+-    { 0x00009b88, 0x0000002c },
+-    { 0x00009b8c, 0x0000002d },
+-    { 0x00009b90, 0x00000030 },
+-    { 0x00009b94, 0x00000031 },
+-    { 0x00009b98, 0x00000032 },
+-    { 0x00009b9c, 0x00000033 },
+-    { 0x00009ba0, 0x00000034 },
+-    { 0x00009ba4, 0x00000035 },
+-    { 0x00009ba8, 0x00000035 },
+-    { 0x00009bac, 0x00000035 },
+-    { 0x00009bb0, 0x00000035 },
+-    { 0x00009bb4, 0x00000035 },
+-    { 0x00009bb8, 0x00000035 },
+-    { 0x00009bbc, 0x00000035 },
+-    { 0x00009bc0, 0x00000035 },
+-    { 0x00009bc4, 0x00000035 },
+-    { 0x00009bc8, 0x00000035 },
+-    { 0x00009bcc, 0x00000035 },
+-    { 0x00009bd0, 0x00000035 },
+-    { 0x00009bd4, 0x00000035 },
+-    { 0x00009bd8, 0x00000035 },
+-    { 0x00009bdc, 0x00000035 },
+-    { 0x00009be0, 0x00000035 },
+-    { 0x00009be4, 0x00000035 },
+-    { 0x00009be8, 0x00000035 },
+-    { 0x00009bec, 0x00000035 },
+-    { 0x00009bf0, 0x00000035 },
+-    { 0x00009bf4, 0x00000035 },
+-    { 0x00009bf8, 0x00000010 },
+-    { 0x00009bfc, 0x0000001a },
+-    { 0x0000a210, 0x40806333 },
+-    { 0x0000a214, 0x00106c10 },
+-    { 0x0000a218, 0x009c4060 },
+-    { 0x0000a220, 0x018830c6 },
+-    { 0x0000a224, 0x00000400 },
+-    { 0x0000a228, 0x00000bb5 },
+-    { 0x0000a22c, 0x00000011 },
+-    { 0x0000a234, 0x20202020 },
+-    { 0x0000a238, 0x20202020 },
+-    { 0x0000a23c, 0x13c889af },
+-    { 0x0000a240, 0x38490a20 },
+-    { 0x0000a244, 0x00007bb6 },
+-    { 0x0000a248, 0x0fff3ffc },
+-    { 0x0000a24c, 0x00000001 },
+-    { 0x0000a250, 0x0000a000 },
+-    { 0x0000a254, 0x00000000 },
+-    { 0x0000a258, 0x0cc75380 },
+-    { 0x0000a25c, 0x0f0f0f01 },
+-    { 0x0000a260, 0xdfa91f01 },
+-    { 0x0000a268, 0x00000000 },
+-    { 0x0000a26c, 0x0e79e5c6 },
+-    { 0x0000b26c, 0x0e79e5c6 },
+-    { 0x0000c26c, 0x0e79e5c6 },
+-    { 0x0000d270, 0x00820820 },
+-    { 0x0000a278, 0x1ce739ce },
+-    { 0x0000a27c, 0x051701ce },
+-    { 0x0000a338, 0x00000000 },
+-    { 0x0000a33c, 0x00000000 },
+-    { 0x0000a340, 0x00000000 },
+-    { 0x0000a344, 0x00000000 },
+-    { 0x0000a348, 0x3fffffff },
+-    { 0x0000a34c, 0x3fffffff },
+-    { 0x0000a350, 0x3fffffff },
+-    { 0x0000a354, 0x0003ffff },
+-    { 0x0000a358, 0x79a8aa1f },
+-    { 0x0000d35c, 0x07ffffef },
+-    { 0x0000d360, 0x0fffffe7 },
+-    { 0x0000d364, 0x17ffffe5 },
+-    { 0x0000d368, 0x1fffffe4 },
+-    { 0x0000d36c, 0x37ffffe3 },
+-    { 0x0000d370, 0x3fffffe3 },
+-    { 0x0000d374, 0x57ffffe3 },
+-    { 0x0000d378, 0x5fffffe2 },
+-    { 0x0000d37c, 0x7fffffe2 },
+-    { 0x0000d380, 0x7f3c7bba },
+-    { 0x0000d384, 0xf3307ff0 },
+-    { 0x0000a388, 0x08000000 },
+-    { 0x0000a38c, 0x20202020 },
+-    { 0x0000a390, 0x20202020 },
+-    { 0x0000a394, 0x1ce739ce },
+-    { 0x0000a398, 0x000001ce },
+-    { 0x0000a39c, 0x00000001 },
+-    { 0x0000a3a0, 0x00000000 },
+-    { 0x0000a3a4, 0x00000000 },
+-    { 0x0000a3a8, 0x00000000 },
+-    { 0x0000a3ac, 0x00000000 },
+-    { 0x0000a3b0, 0x00000000 },
+-    { 0x0000a3b4, 0x00000000 },
+-    { 0x0000a3b8, 0x00000000 },
+-    { 0x0000a3bc, 0x00000000 },
+-    { 0x0000a3c0, 0x00000000 },
+-    { 0x0000a3c4, 0x00000000 },
+-    { 0x0000a3c8, 0x00000246 },
+-    { 0x0000a3cc, 0x20202020 },
+-    { 0x0000a3d0, 0x20202020 },
+-    { 0x0000a3d4, 0x20202020 },
+-    { 0x0000a3dc, 0x1ce739ce },
+-    { 0x0000a3e0, 0x000001ce },
++      /* Addr      allmodes  */
++      {0x0000000c, 0x00000000},
++      {0x00000030, 0x00020015},
++      {0x00000034, 0x00000005},
++      {0x00000040, 0x00000000},
++      {0x00000044, 0x00000008},
++      {0x00000048, 0x00000008},
++      {0x0000004c, 0x00000010},
++      {0x00000050, 0x00000000},
++      {0x00000054, 0x0000001f},
++      {0x00000800, 0x00000000},
++      {0x00000804, 0x00000000},
++      {0x00000808, 0x00000000},
++      {0x0000080c, 0x00000000},
++      {0x00000810, 0x00000000},
++      {0x00000814, 0x00000000},
++      {0x00000818, 0x00000000},
++      {0x0000081c, 0x00000000},
++      {0x00000820, 0x00000000},
++      {0x00000824, 0x00000000},
++      {0x00001040, 0x002ffc0f},
++      {0x00001044, 0x002ffc0f},
++      {0x00001048, 0x002ffc0f},
++      {0x0000104c, 0x002ffc0f},
++      {0x00001050, 0x002ffc0f},
++      {0x00001054, 0x002ffc0f},
++      {0x00001058, 0x002ffc0f},
++      {0x0000105c, 0x002ffc0f},
++      {0x00001060, 0x002ffc0f},
++      {0x00001064, 0x002ffc0f},
++      {0x00001230, 0x00000000},
++      {0x00001270, 0x00000000},
++      {0x00001038, 0x00000000},
++      {0x00001078, 0x00000000},
++      {0x000010b8, 0x00000000},
++      {0x000010f8, 0x00000000},
++      {0x00001138, 0x00000000},
++      {0x00001178, 0x00000000},
++      {0x000011b8, 0x00000000},
++      {0x000011f8, 0x00000000},
++      {0x00001238, 0x00000000},
++      {0x00001278, 0x00000000},
++      {0x000012b8, 0x00000000},
++      {0x000012f8, 0x00000000},
++      {0x00001338, 0x00000000},
++      {0x00001378, 0x00000000},
++      {0x000013b8, 0x00000000},
++      {0x000013f8, 0x00000000},
++      {0x00001438, 0x00000000},
++      {0x00001478, 0x00000000},
++      {0x000014b8, 0x00000000},
++      {0x000014f8, 0x00000000},
++      {0x00001538, 0x00000000},
++      {0x00001578, 0x00000000},
++      {0x000015b8, 0x00000000},
++      {0x000015f8, 0x00000000},
++      {0x00001638, 0x00000000},
++      {0x00001678, 0x00000000},
++      {0x000016b8, 0x00000000},
++      {0x000016f8, 0x00000000},
++      {0x00001738, 0x00000000},
++      {0x00001778, 0x00000000},
++      {0x000017b8, 0x00000000},
++      {0x000017f8, 0x00000000},
++      {0x0000103c, 0x00000000},
++      {0x0000107c, 0x00000000},
++      {0x000010bc, 0x00000000},
++      {0x000010fc, 0x00000000},
++      {0x0000113c, 0x00000000},
++      {0x0000117c, 0x00000000},
++      {0x000011bc, 0x00000000},
++      {0x000011fc, 0x00000000},
++      {0x0000123c, 0x00000000},
++      {0x0000127c, 0x00000000},
++      {0x000012bc, 0x00000000},
++      {0x000012fc, 0x00000000},
++      {0x0000133c, 0x00000000},
++      {0x0000137c, 0x00000000},
++      {0x000013bc, 0x00000000},
++      {0x000013fc, 0x00000000},
++      {0x0000143c, 0x00000000},
++      {0x0000147c, 0x00000000},
++      {0x00004030, 0x00000002},
++      {0x0000403c, 0x00000002},
++      {0x00007010, 0x00000000},
++      {0x00007038, 0x000004c2},
++      {0x00008004, 0x00000000},
++      {0x00008008, 0x00000000},
++      {0x0000800c, 0x00000000},
++      {0x00008018, 0x00000700},
++      {0x00008020, 0x00000000},
++      {0x00008038, 0x00000000},
++      {0x0000803c, 0x00000000},
++      {0x00008048, 0x40000000},
++      {0x00008054, 0x00000000},
++      {0x00008058, 0x00000000},
++      {0x0000805c, 0x000fc78f},
++      {0x00008060, 0x0000000f},
++      {0x00008064, 0x00000000},
++      {0x000080c0, 0x2a82301a},
++      {0x000080c4, 0x05dc01e0},
++      {0x000080c8, 0x1f402710},
++      {0x000080cc, 0x01f40000},
++      {0x000080d0, 0x00001e00},
++      {0x000080d4, 0x00000000},
++      {0x000080d8, 0x00400000},
++      {0x000080e0, 0xffffffff},
++      {0x000080e4, 0x0000ffff},
++      {0x000080e8, 0x003f3f3f},
++      {0x000080ec, 0x00000000},
++      {0x000080f0, 0x00000000},
++      {0x000080f4, 0x00000000},
++      {0x000080f8, 0x00000000},
++      {0x000080fc, 0x00020000},
++      {0x00008100, 0x00020000},
++      {0x00008104, 0x00000001},
++      {0x00008108, 0x00000052},
++      {0x0000810c, 0x00000000},
++      {0x00008110, 0x00000168},
++      {0x00008118, 0x000100aa},
++      {0x0000811c, 0x00003210},
++      {0x00008124, 0x00000000},
++      {0x00008128, 0x00000000},
++      {0x0000812c, 0x00000000},
++      {0x00008130, 0x00000000},
++      {0x00008134, 0x00000000},
++      {0x00008138, 0x00000000},
++      {0x0000813c, 0x00000000},
++      {0x00008144, 0xffffffff},
++      {0x00008168, 0x00000000},
++      {0x0000816c, 0x00000000},
++      {0x00008170, 0x32143320},
++      {0x00008174, 0xfaa4fa50},
++      {0x00008178, 0x00000100},
++      {0x0000817c, 0x00000000},
++      {0x000081c4, 0x00000000},
++      {0x000081ec, 0x00000000},
++      {0x000081f0, 0x00000000},
++      {0x000081f4, 0x00000000},
++      {0x000081f8, 0x00000000},
++      {0x000081fc, 0x00000000},
++      {0x00008200, 0x00000000},
++      {0x00008204, 0x00000000},
++      {0x00008208, 0x00000000},
++      {0x0000820c, 0x00000000},
++      {0x00008210, 0x00000000},
++      {0x00008214, 0x00000000},
++      {0x00008218, 0x00000000},
++      {0x0000821c, 0x00000000},
++      {0x00008220, 0x00000000},
++      {0x00008224, 0x00000000},
++      {0x00008228, 0x00000000},
++      {0x0000822c, 0x00000000},
++      {0x00008230, 0x00000000},
++      {0x00008234, 0x00000000},
++      {0x00008238, 0x00000000},
++      {0x0000823c, 0x00000000},
++      {0x00008240, 0x00100000},
++      {0x00008244, 0x0010f400},
++      {0x00008248, 0x00000100},
++      {0x0000824c, 0x0001e800},
++      {0x00008250, 0x00000000},
++      {0x00008254, 0x00000000},
++      {0x00008258, 0x00000000},
++      {0x0000825c, 0x400000ff},
++      {0x00008260, 0x00080922},
++      {0x00008264, 0x88000010},
++      {0x00008270, 0x00000000},
++      {0x00008274, 0x40000000},
++      {0x00008278, 0x003e4180},
++      {0x0000827c, 0x00000000},
++      {0x00008284, 0x0000002c},
++      {0x00008288, 0x0000002c},
++      {0x0000828c, 0x00000000},
++      {0x00008294, 0x00000000},
++      {0x00008298, 0x00000000},
++      {0x00008300, 0x00000000},
++      {0x00008304, 0x00000000},
++      {0x00008308, 0x00000000},
++      {0x0000830c, 0x00000000},
++      {0x00008310, 0x00000000},
++      {0x00008314, 0x00000000},
++      {0x00008318, 0x00000000},
++      {0x00008328, 0x00000000},
++      {0x0000832c, 0x00000007},
++      {0x00008330, 0x00000302},
++      {0x00008334, 0x00000e00},
++      {0x00008338, 0x00070000},
++      {0x0000833c, 0x00000000},
++      {0x00008340, 0x000107ff},
++      {0x00009808, 0x00000000},
++      {0x0000980c, 0xad848e19},
++      {0x00009810, 0x7d14e000},
++      {0x00009814, 0x9c0a9f6b},
++      {0x0000981c, 0x00000000},
++      {0x0000982c, 0x0000a000},
++      {0x00009830, 0x00000000},
++      {0x0000983c, 0x00200400},
++      {0x00009840, 0x206a002e},
++      {0x0000984c, 0x1284233c},
++      {0x00009854, 0x00000859},
++      {0x00009900, 0x00000000},
++      {0x00009904, 0x00000000},
++      {0x00009908, 0x00000000},
++      {0x0000990c, 0x00000000},
++      {0x0000991c, 0x10000fff},
++      {0x00009920, 0x05100000},
++      {0x0000a920, 0x05100000},
++      {0x0000b920, 0x05100000},
++      {0x00009928, 0x00000001},
++      {0x0000992c, 0x00000004},
++      {0x00009934, 0x1e1f2022},
++      {0x00009938, 0x0a0b0c0d},
++      {0x0000993c, 0x00000000},
++      {0x00009948, 0x9280b212},
++      {0x0000994c, 0x00020028},
++      {0x00009954, 0x5d50e188},
++      {0x00009958, 0x00081fff},
++      {0x0000c95c, 0x004b6a8e},
++      {0x0000c968, 0x000003ce},
++      {0x00009970, 0x190fb515},
++      {0x00009974, 0x00000000},
++      {0x00009978, 0x00000001},
++      {0x0000997c, 0x00000000},
++      {0x00009980, 0x00000000},
++      {0x00009984, 0x00000000},
++      {0x00009988, 0x00000000},
++      {0x0000998c, 0x00000000},
++      {0x00009990, 0x00000000},
++      {0x00009994, 0x00000000},
++      {0x00009998, 0x00000000},
++      {0x0000999c, 0x00000000},
++      {0x000099a0, 0x00000000},
++      {0x000099a4, 0x00000001},
++      {0x000099a8, 0x001fff00},
++      {0x000099ac, 0x00000000},
++      {0x000099b0, 0x03051000},
++      {0x000099dc, 0x00000000},
++      {0x000099e0, 0x00000200},
++      {0x000099e4, 0xaaaaaaaa},
++      {0x000099e8, 0x3c466478},
++      {0x000099ec, 0x000000aa},
++      {0x000099fc, 0x00001042},
++      {0x00009b00, 0x00000000},
++      {0x00009b04, 0x00000001},
++      {0x00009b08, 0x00000002},
++      {0x00009b0c, 0x00000003},
++      {0x00009b10, 0x00000004},
++      {0x00009b14, 0x00000005},
++      {0x00009b18, 0x00000008},
++      {0x00009b1c, 0x00000009},
++      {0x00009b20, 0x0000000a},
++      {0x00009b24, 0x0000000b},
++      {0x00009b28, 0x0000000c},
++      {0x00009b2c, 0x0000000d},
++      {0x00009b30, 0x00000010},
++      {0x00009b34, 0x00000011},
++      {0x00009b38, 0x00000012},
++      {0x00009b3c, 0x00000013},
++      {0x00009b40, 0x00000014},
++      {0x00009b44, 0x00000015},
++      {0x00009b48, 0x00000018},
++      {0x00009b4c, 0x00000019},
++      {0x00009b50, 0x0000001a},
++      {0x00009b54, 0x0000001b},
++      {0x00009b58, 0x0000001c},
++      {0x00009b5c, 0x0000001d},
++      {0x00009b60, 0x00000020},
++      {0x00009b64, 0x00000021},
++      {0x00009b68, 0x00000022},
++      {0x00009b6c, 0x00000023},
++      {0x00009b70, 0x00000024},
++      {0x00009b74, 0x00000025},
++      {0x00009b78, 0x00000028},
++      {0x00009b7c, 0x00000029},
++      {0x00009b80, 0x0000002a},
++      {0x00009b84, 0x0000002b},
++      {0x00009b88, 0x0000002c},
++      {0x00009b8c, 0x0000002d},
++      {0x00009b90, 0x00000030},
++      {0x00009b94, 0x00000031},
++      {0x00009b98, 0x00000032},
++      {0x00009b9c, 0x00000033},
++      {0x00009ba0, 0x00000034},
++      {0x00009ba4, 0x00000035},
++      {0x00009ba8, 0x00000035},
++      {0x00009bac, 0x00000035},
++      {0x00009bb0, 0x00000035},
++      {0x00009bb4, 0x00000035},
++      {0x00009bb8, 0x00000035},
++      {0x00009bbc, 0x00000035},
++      {0x00009bc0, 0x00000035},
++      {0x00009bc4, 0x00000035},
++      {0x00009bc8, 0x00000035},
++      {0x00009bcc, 0x00000035},
++      {0x00009bd0, 0x00000035},
++      {0x00009bd4, 0x00000035},
++      {0x00009bd8, 0x00000035},
++      {0x00009bdc, 0x00000035},
++      {0x00009be0, 0x00000035},
++      {0x00009be4, 0x00000035},
++      {0x00009be8, 0x00000035},
++      {0x00009bec, 0x00000035},
++      {0x00009bf0, 0x00000035},
++      {0x00009bf4, 0x00000035},
++      {0x00009bf8, 0x00000010},
++      {0x00009bfc, 0x0000001a},
++      {0x0000a210, 0x40806333},
++      {0x0000a214, 0x00106c10},
++      {0x0000a218, 0x009c4060},
++      {0x0000a220, 0x018830c6},
++      {0x0000a224, 0x00000400},
++      {0x0000a228, 0x00000bb5},
++      {0x0000a22c, 0x00000011},
++      {0x0000a234, 0x20202020},
++      {0x0000a238, 0x20202020},
++      {0x0000a23c, 0x13c889af},
++      {0x0000a240, 0x38490a20},
++      {0x0000a244, 0x00007bb6},
++      {0x0000a248, 0x0fff3ffc},
++      {0x0000a24c, 0x00000001},
++      {0x0000a250, 0x0000a000},
++      {0x0000a254, 0x00000000},
++      {0x0000a258, 0x0cc75380},
++      {0x0000a25c, 0x0f0f0f01},
++      {0x0000a260, 0xdfa91f01},
++      {0x0000a268, 0x00000000},
++      {0x0000a26c, 0x0e79e5c6},
++      {0x0000b26c, 0x0e79e5c6},
++      {0x0000c26c, 0x0e79e5c6},
++      {0x0000d270, 0x00820820},
++      {0x0000a278, 0x1ce739ce},
++      {0x0000a27c, 0x051701ce},
++      {0x0000a338, 0x00000000},
++      {0x0000a33c, 0x00000000},
++      {0x0000a340, 0x00000000},
++      {0x0000a344, 0x00000000},
++      {0x0000a348, 0x3fffffff},
++      {0x0000a34c, 0x3fffffff},
++      {0x0000a350, 0x3fffffff},
++      {0x0000a354, 0x0003ffff},
++      {0x0000a358, 0x79a8aa1f},
++      {0x0000d35c, 0x07ffffef},
++      {0x0000d360, 0x0fffffe7},
++      {0x0000d364, 0x17ffffe5},
++      {0x0000d368, 0x1fffffe4},
++      {0x0000d36c, 0x37ffffe3},
++      {0x0000d370, 0x3fffffe3},
++      {0x0000d374, 0x57ffffe3},
++      {0x0000d378, 0x5fffffe2},
++      {0x0000d37c, 0x7fffffe2},
++      {0x0000d380, 0x7f3c7bba},
++      {0x0000d384, 0xf3307ff0},
++      {0x0000a388, 0x08000000},
++      {0x0000a38c, 0x20202020},
++      {0x0000a390, 0x20202020},
++      {0x0000a394, 0x1ce739ce},
++      {0x0000a398, 0x000001ce},
++      {0x0000a39c, 0x00000001},
++      {0x0000a3a0, 0x00000000},
++      {0x0000a3a4, 0x00000000},
++      {0x0000a3a8, 0x00000000},
++      {0x0000a3ac, 0x00000000},
++      {0x0000a3b0, 0x00000000},
++      {0x0000a3b4, 0x00000000},
++      {0x0000a3b8, 0x00000000},
++      {0x0000a3bc, 0x00000000},
++      {0x0000a3c0, 0x00000000},
++      {0x0000a3c4, 0x00000000},
++      {0x0000a3c8, 0x00000246},
++      {0x0000a3cc, 0x20202020},
++      {0x0000a3d0, 0x20202020},
++      {0x0000a3d4, 0x20202020},
++      {0x0000a3dc, 0x1ce739ce},
++      {0x0000a3e0, 0x000001ce},
+ };
+ static const u32 ar5416Bank0[][2] = {
+-    { 0x000098b0, 0x1e5795e5 },
+-    { 0x000098e0, 0x02008020 },
++      /* Addr      allmodes  */
++      {0x000098b0, 0x1e5795e5},
++      {0x000098e0, 0x02008020},
+ };
+ static const u32 ar5416BB_RfGain[][3] = {
+-    { 0x00009a00, 0x00000000, 0x00000000 },
+-    { 0x00009a04, 0x00000040, 0x00000040 },
+-    { 0x00009a08, 0x00000080, 0x00000080 },
+-    { 0x00009a0c, 0x000001a1, 0x00000141 },
+-    { 0x00009a10, 0x000001e1, 0x00000181 },
+-    { 0x00009a14, 0x00000021, 0x000001c1 },
+-    { 0x00009a18, 0x00000061, 0x00000001 },
+-    { 0x00009a1c, 0x00000168, 0x00000041 },
+-    { 0x00009a20, 0x000001a8, 0x000001a8 },
+-    { 0x00009a24, 0x000001e8, 0x000001e8 },
+-    { 0x00009a28, 0x00000028, 0x00000028 },
+-    { 0x00009a2c, 0x00000068, 0x00000068 },
+-    { 0x00009a30, 0x00000189, 0x000000a8 },
+-    { 0x00009a34, 0x000001c9, 0x00000169 },
+-    { 0x00009a38, 0x00000009, 0x000001a9 },
+-    { 0x00009a3c, 0x00000049, 0x000001e9 },
+-    { 0x00009a40, 0x00000089, 0x00000029 },
+-    { 0x00009a44, 0x00000170, 0x00000069 },
+-    { 0x00009a48, 0x000001b0, 0x00000190 },
+-    { 0x00009a4c, 0x000001f0, 0x000001d0 },
+-    { 0x00009a50, 0x00000030, 0x00000010 },
+-    { 0x00009a54, 0x00000070, 0x00000050 },
+-    { 0x00009a58, 0x00000191, 0x00000090 },
+-    { 0x00009a5c, 0x000001d1, 0x00000151 },
+-    { 0x00009a60, 0x00000011, 0x00000191 },
+-    { 0x00009a64, 0x00000051, 0x000001d1 },
+-    { 0x00009a68, 0x00000091, 0x00000011 },
+-    { 0x00009a6c, 0x000001b8, 0x00000051 },
+-    { 0x00009a70, 0x000001f8, 0x00000198 },
+-    { 0x00009a74, 0x00000038, 0x000001d8 },
+-    { 0x00009a78, 0x00000078, 0x00000018 },
+-    { 0x00009a7c, 0x00000199, 0x00000058 },
+-    { 0x00009a80, 0x000001d9, 0x00000098 },
+-    { 0x00009a84, 0x00000019, 0x00000159 },
+-    { 0x00009a88, 0x00000059, 0x00000199 },
+-    { 0x00009a8c, 0x00000099, 0x000001d9 },
+-    { 0x00009a90, 0x000000d9, 0x00000019 },
+-    { 0x00009a94, 0x000000f9, 0x00000059 },
+-    { 0x00009a98, 0x000000f9, 0x00000099 },
+-    { 0x00009a9c, 0x000000f9, 0x000000d9 },
+-    { 0x00009aa0, 0x000000f9, 0x000000f9 },
+-    { 0x00009aa4, 0x000000f9, 0x000000f9 },
+-    { 0x00009aa8, 0x000000f9, 0x000000f9 },
+-    { 0x00009aac, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab8, 0x000000f9, 0x000000f9 },
+-    { 0x00009abc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac8, 0x000000f9, 0x000000f9 },
+-    { 0x00009acc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad8, 0x000000f9, 0x000000f9 },
+-    { 0x00009adc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae8, 0x000000f9, 0x000000f9 },
+-    { 0x00009aec, 0x000000f9, 0x000000f9 },
+-    { 0x00009af0, 0x000000f9, 0x000000f9 },
+-    { 0x00009af4, 0x000000f9, 0x000000f9 },
+-    { 0x00009af8, 0x000000f9, 0x000000f9 },
+-    { 0x00009afc, 0x000000f9, 0x000000f9 },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x00009a00, 0x00000000, 0x00000000},
++      {0x00009a04, 0x00000040, 0x00000040},
++      {0x00009a08, 0x00000080, 0x00000080},
++      {0x00009a0c, 0x000001a1, 0x00000141},
++      {0x00009a10, 0x000001e1, 0x00000181},
++      {0x00009a14, 0x00000021, 0x000001c1},
++      {0x00009a18, 0x00000061, 0x00000001},
++      {0x00009a1c, 0x00000168, 0x00000041},
++      {0x00009a20, 0x000001a8, 0x000001a8},
++      {0x00009a24, 0x000001e8, 0x000001e8},
++      {0x00009a28, 0x00000028, 0x00000028},
++      {0x00009a2c, 0x00000068, 0x00000068},
++      {0x00009a30, 0x00000189, 0x000000a8},
++      {0x00009a34, 0x000001c9, 0x00000169},
++      {0x00009a38, 0x00000009, 0x000001a9},
++      {0x00009a3c, 0x00000049, 0x000001e9},
++      {0x00009a40, 0x00000089, 0x00000029},
++      {0x00009a44, 0x00000170, 0x00000069},
++      {0x00009a48, 0x000001b0, 0x00000190},
++      {0x00009a4c, 0x000001f0, 0x000001d0},
++      {0x00009a50, 0x00000030, 0x00000010},
++      {0x00009a54, 0x00000070, 0x00000050},
++      {0x00009a58, 0x00000191, 0x00000090},
++      {0x00009a5c, 0x000001d1, 0x00000151},
++      {0x00009a60, 0x00000011, 0x00000191},
++      {0x00009a64, 0x00000051, 0x000001d1},
++      {0x00009a68, 0x00000091, 0x00000011},
++      {0x00009a6c, 0x000001b8, 0x00000051},
++      {0x00009a70, 0x000001f8, 0x00000198},
++      {0x00009a74, 0x00000038, 0x000001d8},
++      {0x00009a78, 0x00000078, 0x00000018},
++      {0x00009a7c, 0x00000199, 0x00000058},
++      {0x00009a80, 0x000001d9, 0x00000098},
++      {0x00009a84, 0x00000019, 0x00000159},
++      {0x00009a88, 0x00000059, 0x00000199},
++      {0x00009a8c, 0x00000099, 0x000001d9},
++      {0x00009a90, 0x000000d9, 0x00000019},
++      {0x00009a94, 0x000000f9, 0x00000059},
++      {0x00009a98, 0x000000f9, 0x00000099},
++      {0x00009a9c, 0x000000f9, 0x000000d9},
++      {0x00009aa0, 0x000000f9, 0x000000f9},
++      {0x00009aa4, 0x000000f9, 0x000000f9},
++      {0x00009aa8, 0x000000f9, 0x000000f9},
++      {0x00009aac, 0x000000f9, 0x000000f9},
++      {0x00009ab0, 0x000000f9, 0x000000f9},
++      {0x00009ab4, 0x000000f9, 0x000000f9},
++      {0x00009ab8, 0x000000f9, 0x000000f9},
++      {0x00009abc, 0x000000f9, 0x000000f9},
++      {0x00009ac0, 0x000000f9, 0x000000f9},
++      {0x00009ac4, 0x000000f9, 0x000000f9},
++      {0x00009ac8, 0x000000f9, 0x000000f9},
++      {0x00009acc, 0x000000f9, 0x000000f9},
++      {0x00009ad0, 0x000000f9, 0x000000f9},
++      {0x00009ad4, 0x000000f9, 0x000000f9},
++      {0x00009ad8, 0x000000f9, 0x000000f9},
++      {0x00009adc, 0x000000f9, 0x000000f9},
++      {0x00009ae0, 0x000000f9, 0x000000f9},
++      {0x00009ae4, 0x000000f9, 0x000000f9},
++      {0x00009ae8, 0x000000f9, 0x000000f9},
++      {0x00009aec, 0x000000f9, 0x000000f9},
++      {0x00009af0, 0x000000f9, 0x000000f9},
++      {0x00009af4, 0x000000f9, 0x000000f9},
++      {0x00009af8, 0x000000f9, 0x000000f9},
++      {0x00009afc, 0x000000f9, 0x000000f9},
+ };
+ static const u32 ar5416Bank1[][2] = {
+-    { 0x000098b0, 0x02108421 },
+-    { 0x000098ec, 0x00000008 },
++      /* Addr      allmodes  */
++      {0x000098b0, 0x02108421},
++      {0x000098ec, 0x00000008},
+ };
+ static const u32 ar5416Bank2[][2] = {
+-    { 0x000098b0, 0x0e73ff17 },
+-    { 0x000098e0, 0x00000420 },
++      /* Addr      allmodes  */
++      {0x000098b0, 0x0e73ff17},
++      {0x000098e0, 0x00000420},
+ };
+ static const u32 ar5416Bank3[][3] = {
+-    { 0x000098f0, 0x01400018, 0x01c00018 },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x000098f0, 0x01400018, 0x01c00018},
+ };
+ static const u32 ar5416Bank6[][3] = {
+-
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00e00000, 0x00e00000 },
+-    { 0x0000989c, 0x005e0000, 0x005e0000 },
+-    { 0x0000989c, 0x00120000, 0x00120000 },
+-    { 0x0000989c, 0x00620000, 0x00620000 },
+-    { 0x0000989c, 0x00020000, 0x00020000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
+-    { 0x0000989c, 0x005f0000, 0x005f0000 },
+-    { 0x0000989c, 0x00870000, 0x00870000 },
+-    { 0x0000989c, 0x00f90000, 0x00f90000 },
+-    { 0x0000989c, 0x007b0000, 0x007b0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00f50000, 0x00f50000 },
+-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
+-    { 0x0000989c, 0x00110000, 0x00110000 },
+-    { 0x0000989c, 0x006100a8, 0x006100a8 },
+-    { 0x0000989c, 0x004210a2, 0x004210a2 },
+-    { 0x0000989c, 0x0014008f, 0x0014008f },
+-    { 0x0000989c, 0x00c40003, 0x00c40003 },
+-    { 0x0000989c, 0x003000f2, 0x003000f2 },
+-    { 0x0000989c, 0x00440016, 0x00440016 },
+-    { 0x0000989c, 0x00410040, 0x00410040 },
+-    { 0x0000989c, 0x0001805e, 0x0001805e },
+-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
+-    { 0x0000989c, 0x000000f1, 0x000000f1 },
+-    { 0x0000989c, 0x00002081, 0x00002081 },
+-    { 0x0000989c, 0x000000d4, 0x000000d4 },
+-    { 0x000098d0, 0x0000000f, 0x0010000f },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00e00000, 0x00e00000},
++      {0x0000989c, 0x005e0000, 0x005e0000},
++      {0x0000989c, 0x00120000, 0x00120000},
++      {0x0000989c, 0x00620000, 0x00620000},
++      {0x0000989c, 0x00020000, 0x00020000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x40ff0000, 0x40ff0000},
++      {0x0000989c, 0x005f0000, 0x005f0000},
++      {0x0000989c, 0x00870000, 0x00870000},
++      {0x0000989c, 0x00f90000, 0x00f90000},
++      {0x0000989c, 0x007b0000, 0x007b0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00f50000, 0x00f50000},
++      {0x0000989c, 0x00dc0000, 0x00dc0000},
++      {0x0000989c, 0x00110000, 0x00110000},
++      {0x0000989c, 0x006100a8, 0x006100a8},
++      {0x0000989c, 0x004210a2, 0x004210a2},
++      {0x0000989c, 0x0014008f, 0x0014008f},
++      {0x0000989c, 0x00c40003, 0x00c40003},
++      {0x0000989c, 0x003000f2, 0x003000f2},
++      {0x0000989c, 0x00440016, 0x00440016},
++      {0x0000989c, 0x00410040, 0x00410040},
++      {0x0000989c, 0x0001805e, 0x0001805e},
++      {0x0000989c, 0x0000c0ab, 0x0000c0ab},
++      {0x0000989c, 0x000000f1, 0x000000f1},
++      {0x0000989c, 0x00002081, 0x00002081},
++      {0x0000989c, 0x000000d4, 0x000000d4},
++      {0x000098d0, 0x0000000f, 0x0010000f},
+ };
+ static const u32 ar5416Bank6TPC[][3] = {
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00e00000, 0x00e00000 },
+-    { 0x0000989c, 0x005e0000, 0x005e0000 },
+-    { 0x0000989c, 0x00120000, 0x00120000 },
+-    { 0x0000989c, 0x00620000, 0x00620000 },
+-    { 0x0000989c, 0x00020000, 0x00020000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
+-    { 0x0000989c, 0x005f0000, 0x005f0000 },
+-    { 0x0000989c, 0x00870000, 0x00870000 },
+-    { 0x0000989c, 0x00f90000, 0x00f90000 },
+-    { 0x0000989c, 0x007b0000, 0x007b0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00f50000, 0x00f50000 },
+-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
+-    { 0x0000989c, 0x00110000, 0x00110000 },
+-    { 0x0000989c, 0x006100a8, 0x006100a8 },
+-    { 0x0000989c, 0x00423022, 0x00423022 },
+-    { 0x0000989c, 0x201400df, 0x201400df },
+-    { 0x0000989c, 0x00c40002, 0x00c40002 },
+-    { 0x0000989c, 0x003000f2, 0x003000f2 },
+-    { 0x0000989c, 0x00440016, 0x00440016 },
+-    { 0x0000989c, 0x00410040, 0x00410040 },
+-    { 0x0000989c, 0x0001805e, 0x0001805e },
+-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
+-    { 0x0000989c, 0x000000e1, 0x000000e1 },
+-    { 0x0000989c, 0x00007081, 0x00007081 },
+-    { 0x0000989c, 0x000000d4, 0x000000d4 },
+-    { 0x000098d0, 0x0000000f, 0x0010000f },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00e00000, 0x00e00000},
++      {0x0000989c, 0x005e0000, 0x005e0000},
++      {0x0000989c, 0x00120000, 0x00120000},
++      {0x0000989c, 0x00620000, 0x00620000},
++      {0x0000989c, 0x00020000, 0x00020000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x40ff0000, 0x40ff0000},
++      {0x0000989c, 0x005f0000, 0x005f0000},
++      {0x0000989c, 0x00870000, 0x00870000},
++      {0x0000989c, 0x00f90000, 0x00f90000},
++      {0x0000989c, 0x007b0000, 0x007b0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00f50000, 0x00f50000},
++      {0x0000989c, 0x00dc0000, 0x00dc0000},
++      {0x0000989c, 0x00110000, 0x00110000},
++      {0x0000989c, 0x006100a8, 0x006100a8},
++      {0x0000989c, 0x00423022, 0x00423022},
++      {0x0000989c, 0x201400df, 0x201400df},
++      {0x0000989c, 0x00c40002, 0x00c40002},
++      {0x0000989c, 0x003000f2, 0x003000f2},
++      {0x0000989c, 0x00440016, 0x00440016},
++      {0x0000989c, 0x00410040, 0x00410040},
++      {0x0000989c, 0x0001805e, 0x0001805e},
++      {0x0000989c, 0x0000c0ab, 0x0000c0ab},
++      {0x0000989c, 0x000000e1, 0x000000e1},
++      {0x0000989c, 0x00007081, 0x00007081},
++      {0x0000989c, 0x000000d4, 0x000000d4},
++      {0x000098d0, 0x0000000f, 0x0010000f},
+ };
+ static const u32 ar5416Bank7[][2] = {
+-    { 0x0000989c, 0x00000500 },
+-    { 0x0000989c, 0x00000800 },
+-    { 0x000098cc, 0x0000000e },
++      /* Addr      allmodes  */
++      {0x0000989c, 0x00000500},
++      {0x0000989c, 0x00000800},
++      {0x000098cc, 0x0000000e},
+ };
+ static const u32 ar5416Addac[][2] = {
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000003 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x0000000c },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000030 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000060 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000058 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x000098cc,  0x00000000 },
+-};
+-
+-static const u32 ar5416Modes_9100[][6] = {
+-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
+-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
+-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
+-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
+-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
+-    { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf },
+-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
+-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
+-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
+-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
+-    { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 },
+-    { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x00009850, 0x6d48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6d48b0e2, 0x6d48b0e2 },
+-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec86d2e, 0x7ec84d2e, 0x7ec82d2e },
+-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e },
+-    { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 },
+-    { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
+-    { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0 },
+-    { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 },
+-    { 0x00009914, 0x000007d0, 0x000007d0, 0x00000898, 0x00000898, 0x000007d0 },
+-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
+-    { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a11, 0xd00a8a0d, 0xd00a8a0d },
+-    { 0x00009940, 0x00754604, 0x00754604, 0xfff81204, 0xfff81204, 0xfff81204 },
+-    { 0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020 },
+-    { 0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, 0xe250a51e },
+-    { 0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, 0x3388ffff },
+-#ifdef TB243
+-    { 0x00009960, 0x00000900, 0x00000900, 0x00009b40, 0x00009b40, 0x00012d80 },
+-    { 0x0000a960, 0x00000900, 0x00000900, 0x00009b40, 0x00009b40, 0x00012d80 },
+-    { 0x0000b960, 0x00000900, 0x00000900, 0x00009b40, 0x00009b40, 0x00012d80 },
+-    { 0x00009964, 0x00000000, 0x00000000, 0x00002210, 0x00002210, 0x00001120 },
+-#else
+-    { 0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
+-    { 0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
+-    { 0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0 },
+-    { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120 },
+-#endif
+-    { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, 0x001a0c00 },
+-    { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be },
+-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
+-    { 0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329 },
+-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
+-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
+-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 },
+-    { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 },
+-    { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
+-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
+-    { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa },
+-    { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 },
+-    { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 },
+-    { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 },
+-    { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b },
+-    { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b },
+-    { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a },
+-    { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf },
+-    { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f },
+-    { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f },
+-    { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f },
+-    { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
++      /* Addr      allmodes  */
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000003},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x0000000c},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000030},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000060},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000058},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x000098cc, 0x00000000},
+ };
+-#endif /* INITVALS_AR5008_H */
+--- a/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9001_initvals.h
+@@ -1,1254 +1,1354 @@
++/*
++ * Copyright (c) 2010 Atheros Communications Inc.
++ *
++ * Permission to use, copy, modify, and/or distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ */
++
++static const u32 ar5416Modes_9100[][6] = {
++      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
++      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
++      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
++      {0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},
++      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
++      {0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf},
++      {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
++      {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
++      {0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
++      {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
++      {0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0},
++      {0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x00009850, 0x6d48b4e2, 0x6d48b4e2, 0x6d48b0e2, 0x6d48b0e2, 0x6d48b0e2},
++      {0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec86d2e, 0x7ec84d2e, 0x7ec82d2e},
++      {0x0000985c, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e},
++      {0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18},
++      {0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
++      {0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0},
++      {0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},
++      {0x00009914, 0x000007d0, 0x000007d0, 0x00000898, 0x00000898, 0x000007d0},
++      {0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016},
++      {0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a11, 0xd00a8a0d, 0xd00a8a0d},
++      {0x00009940, 0x00754604, 0x00754604, 0xfff81204, 0xfff81204, 0xfff81204},
++      {0x00009944, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020, 0xdfb81020},
++      {0x00009954, 0x5f3ca3de, 0x5f3ca3de, 0xe250a51e, 0xe250a51e, 0xe250a51e},
++      {0x00009958, 0x2108ecff, 0x2108ecff, 0x3388ffff, 0x3388ffff, 0x3388ffff},
++      {0x00009960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0},
++      {0x0000a960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0},
++      {0x0000b960, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0, 0x0001bfc0},
++      {0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120},
++      {0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a1000, 0x001a0c00, 0x001a0c00},
++      {0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be},
++      {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
++      {0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329},
++      {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
++      {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
++      {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880},
++      {0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788},
++      {0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
++      {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
++      {0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa},
++      {0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000},
++      {0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402},
++      {0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06},
++      {0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b},
++      {0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b},
++      {0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a},
++      {0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf},
++      {0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f},
++      {0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f},
++      {0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f},
++      {0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++};
+ static const u32 ar5416Common_9100[][2] = {
+-    { 0x0000000c, 0x00000000 },
+-    { 0x00000030, 0x00020015 },
+-    { 0x00000034, 0x00000005 },
+-    { 0x00000040, 0x00000000 },
+-    { 0x00000044, 0x00000008 },
+-    { 0x00000048, 0x00000008 },
+-    { 0x0000004c, 0x00000010 },
+-    { 0x00000050, 0x00000000 },
+-    { 0x00000054, 0x0000001f },
+-    { 0x00000800, 0x00000000 },
+-    { 0x00000804, 0x00000000 },
+-    { 0x00000808, 0x00000000 },
+-    { 0x0000080c, 0x00000000 },
+-    { 0x00000810, 0x00000000 },
+-    { 0x00000814, 0x00000000 },
+-    { 0x00000818, 0x00000000 },
+-    { 0x0000081c, 0x00000000 },
+-    { 0x00000820, 0x00000000 },
+-    { 0x00000824, 0x00000000 },
+-    { 0x00001040, 0x002ffc0f },
+-    { 0x00001044, 0x002ffc0f },
+-    { 0x00001048, 0x002ffc0f },
+-    { 0x0000104c, 0x002ffc0f },
+-    { 0x00001050, 0x002ffc0f },
+-    { 0x00001054, 0x002ffc0f },
+-    { 0x00001058, 0x002ffc0f },
+-    { 0x0000105c, 0x002ffc0f },
+-    { 0x00001060, 0x002ffc0f },
+-    { 0x00001064, 0x002ffc0f },
+-    { 0x00001230, 0x00000000 },
+-    { 0x00001270, 0x00000000 },
+-    { 0x00001038, 0x00000000 },
+-    { 0x00001078, 0x00000000 },
+-    { 0x000010b8, 0x00000000 },
+-    { 0x000010f8, 0x00000000 },
+-    { 0x00001138, 0x00000000 },
+-    { 0x00001178, 0x00000000 },
+-    { 0x000011b8, 0x00000000 },
+-    { 0x000011f8, 0x00000000 },
+-    { 0x00001238, 0x00000000 },
+-    { 0x00001278, 0x00000000 },
+-    { 0x000012b8, 0x00000000 },
+-    { 0x000012f8, 0x00000000 },
+-    { 0x00001338, 0x00000000 },
+-    { 0x00001378, 0x00000000 },
+-    { 0x000013b8, 0x00000000 },
+-    { 0x000013f8, 0x00000000 },
+-    { 0x00001438, 0x00000000 },
+-    { 0x00001478, 0x00000000 },
+-    { 0x000014b8, 0x00000000 },
+-    { 0x000014f8, 0x00000000 },
+-    { 0x00001538, 0x00000000 },
+-    { 0x00001578, 0x00000000 },
+-    { 0x000015b8, 0x00000000 },
+-    { 0x000015f8, 0x00000000 },
+-    { 0x00001638, 0x00000000 },
+-    { 0x00001678, 0x00000000 },
+-    { 0x000016b8, 0x00000000 },
+-    { 0x000016f8, 0x00000000 },
+-    { 0x00001738, 0x00000000 },
+-    { 0x00001778, 0x00000000 },
+-    { 0x000017b8, 0x00000000 },
+-    { 0x000017f8, 0x00000000 },
+-    { 0x0000103c, 0x00000000 },
+-    { 0x0000107c, 0x00000000 },
+-    { 0x000010bc, 0x00000000 },
+-    { 0x000010fc, 0x00000000 },
+-    { 0x0000113c, 0x00000000 },
+-    { 0x0000117c, 0x00000000 },
+-    { 0x000011bc, 0x00000000 },
+-    { 0x000011fc, 0x00000000 },
+-    { 0x0000123c, 0x00000000 },
+-    { 0x0000127c, 0x00000000 },
+-    { 0x000012bc, 0x00000000 },
+-    { 0x000012fc, 0x00000000 },
+-    { 0x0000133c, 0x00000000 },
+-    { 0x0000137c, 0x00000000 },
+-    { 0x000013bc, 0x00000000 },
+-    { 0x000013fc, 0x00000000 },
+-    { 0x0000143c, 0x00000000 },
+-    { 0x0000147c, 0x00000000 },
+-    { 0x00020010, 0x00000003 },
+-    { 0x00020038, 0x000004c2 },
+-    { 0x00008004, 0x00000000 },
+-    { 0x00008008, 0x00000000 },
+-    { 0x0000800c, 0x00000000 },
+-    { 0x00008018, 0x00000700 },
+-    { 0x00008020, 0x00000000 },
+-    { 0x00008038, 0x00000000 },
+-    { 0x0000803c, 0x00000000 },
+-    { 0x00008048, 0x40000000 },
+-    { 0x00008054, 0x00004000 },
+-    { 0x00008058, 0x00000000 },
+-    { 0x0000805c, 0x000fc78f },
+-    { 0x00008060, 0x0000000f },
+-    { 0x00008064, 0x00000000 },
+-    { 0x000080c0, 0x2a82301a },
+-    { 0x000080c4, 0x05dc01e0 },
+-    { 0x000080c8, 0x1f402710 },
+-    { 0x000080cc, 0x01f40000 },
+-    { 0x000080d0, 0x00001e00 },
+-    { 0x000080d4, 0x00000000 },
+-    { 0x000080d8, 0x00400000 },
+-    { 0x000080e0, 0xffffffff },
+-    { 0x000080e4, 0x0000ffff },
+-    { 0x000080e8, 0x003f3f3f },
+-    { 0x000080ec, 0x00000000 },
+-    { 0x000080f0, 0x00000000 },
+-    { 0x000080f4, 0x00000000 },
+-    { 0x000080f8, 0x00000000 },
+-    { 0x000080fc, 0x00020000 },
+-    { 0x00008100, 0x00020000 },
+-    { 0x00008104, 0x00000001 },
+-    { 0x00008108, 0x00000052 },
+-    { 0x0000810c, 0x00000000 },
+-    { 0x00008110, 0x00000168 },
+-    { 0x00008118, 0x000100aa },
+-    { 0x0000811c, 0x00003210 },
+-    { 0x00008120, 0x08f04800 },
+-    { 0x00008124, 0x00000000 },
+-    { 0x00008128, 0x00000000 },
+-    { 0x0000812c, 0x00000000 },
+-    { 0x00008130, 0x00000000 },
+-    { 0x00008134, 0x00000000 },
+-    { 0x00008138, 0x00000000 },
+-    { 0x0000813c, 0x00000000 },
+-    { 0x00008144, 0x00000000 },
+-    { 0x00008168, 0x00000000 },
+-    { 0x0000816c, 0x00000000 },
+-    { 0x00008170, 0x32143320 },
+-    { 0x00008174, 0xfaa4fa50 },
+-    { 0x00008178, 0x00000100 },
+-    { 0x0000817c, 0x00000000 },
+-    { 0x000081c4, 0x00000000 },
+-    { 0x000081d0, 0x00003210 },
+-    { 0x000081ec, 0x00000000 },
+-    { 0x000081f0, 0x00000000 },
+-    { 0x000081f4, 0x00000000 },
+-    { 0x000081f8, 0x00000000 },
+-    { 0x000081fc, 0x00000000 },
+-    { 0x00008200, 0x00000000 },
+-    { 0x00008204, 0x00000000 },
+-    { 0x00008208, 0x00000000 },
+-    { 0x0000820c, 0x00000000 },
+-    { 0x00008210, 0x00000000 },
+-    { 0x00008214, 0x00000000 },
+-    { 0x00008218, 0x00000000 },
+-    { 0x0000821c, 0x00000000 },
+-    { 0x00008220, 0x00000000 },
+-    { 0x00008224, 0x00000000 },
+-    { 0x00008228, 0x00000000 },
+-    { 0x0000822c, 0x00000000 },
+-    { 0x00008230, 0x00000000 },
+-    { 0x00008234, 0x00000000 },
+-    { 0x00008238, 0x00000000 },
+-    { 0x0000823c, 0x00000000 },
+-    { 0x00008240, 0x00100000 },
+-    { 0x00008244, 0x0010f400 },
+-    { 0x00008248, 0x00000100 },
+-    { 0x0000824c, 0x0001e800 },
+-    { 0x00008250, 0x00000000 },
+-    { 0x00008254, 0x00000000 },
+-    { 0x00008258, 0x00000000 },
+-    { 0x0000825c, 0x400000ff },
+-    { 0x00008260, 0x00080922 },
+-    { 0x00008270, 0x00000000 },
+-    { 0x00008274, 0x40000000 },
+-    { 0x00008278, 0x003e4180 },
+-    { 0x0000827c, 0x00000000 },
+-    { 0x00008284, 0x0000002c },
+-    { 0x00008288, 0x0000002c },
+-    { 0x0000828c, 0x00000000 },
+-    { 0x00008294, 0x00000000 },
+-    { 0x00008298, 0x00000000 },
+-    { 0x00008300, 0x00000000 },
+-    { 0x00008304, 0x00000000 },
+-    { 0x00008308, 0x00000000 },
+-    { 0x0000830c, 0x00000000 },
+-    { 0x00008310, 0x00000000 },
+-    { 0x00008314, 0x00000000 },
+-    { 0x00008318, 0x00000000 },
+-    { 0x00008328, 0x00000000 },
+-    { 0x0000832c, 0x00000007 },
+-    { 0x00008330, 0x00000302 },
+-    { 0x00008334, 0x00000e00 },
+-    { 0x00008338, 0x00000000 },
+-    { 0x0000833c, 0x00000000 },
+-    { 0x00008340, 0x000107ff },
+-    { 0x00009808, 0x00000000 },
+-    { 0x0000980c, 0xad848e19 },
+-    { 0x00009810, 0x7d14e000 },
+-    { 0x00009814, 0x9c0a9f6b },
+-    { 0x0000981c, 0x00000000 },
+-    { 0x0000982c, 0x0000a000 },
+-    { 0x00009830, 0x00000000 },
+-    { 0x0000983c, 0x00200400 },
+-    { 0x00009840, 0x206a01ae },
+-    { 0x0000984c, 0x1284233c },
+-    { 0x00009854, 0x00000859 },
+-    { 0x00009900, 0x00000000 },
+-    { 0x00009904, 0x00000000 },
+-    { 0x00009908, 0x00000000 },
+-    { 0x0000990c, 0x00000000 },
+-    { 0x0000991c, 0x10000fff },
+-    { 0x00009920, 0x05100000 },
+-    { 0x0000a920, 0x05100000 },
+-    { 0x0000b920, 0x05100000 },
+-    { 0x00009928, 0x00000001 },
+-    { 0x0000992c, 0x00000004 },
+-    { 0x00009934, 0x1e1f2022 },
+-    { 0x00009938, 0x0a0b0c0d },
+-    { 0x0000993c, 0x00000000 },
+-    { 0x00009948, 0x9280b212 },
+-    { 0x0000994c, 0x00020028 },
+-    { 0x0000c95c, 0x004b6a8e },
+-    { 0x0000c968, 0x000003ce },
+-    { 0x00009970, 0x190fb515 },
+-    { 0x00009974, 0x00000000 },
+-    { 0x00009978, 0x00000001 },
+-    { 0x0000997c, 0x00000000 },
+-    { 0x00009980, 0x00000000 },
+-    { 0x00009984, 0x00000000 },
+-    { 0x00009988, 0x00000000 },
+-    { 0x0000998c, 0x00000000 },
+-    { 0x00009990, 0x00000000 },
+-    { 0x00009994, 0x00000000 },
+-    { 0x00009998, 0x00000000 },
+-    { 0x0000999c, 0x00000000 },
+-    { 0x000099a0, 0x00000000 },
+-    { 0x000099a4, 0x00000001 },
+-    { 0x000099a8, 0x201fff00 },
+-    { 0x000099ac, 0x006f0000 },
+-    { 0x000099b0, 0x03051000 },
+-    { 0x000099dc, 0x00000000 },
+-    { 0x000099e0, 0x00000200 },
+-    { 0x000099e4, 0xaaaaaaaa },
+-    { 0x000099e8, 0x3c466478 },
+-    { 0x000099ec, 0x0cc80caa },
+-    { 0x000099fc, 0x00001042 },
+-    { 0x00009b00, 0x00000000 },
+-    { 0x00009b04, 0x00000001 },
+-    { 0x00009b08, 0x00000002 },
+-    { 0x00009b0c, 0x00000003 },
+-    { 0x00009b10, 0x00000004 },
+-    { 0x00009b14, 0x00000005 },
+-    { 0x00009b18, 0x00000008 },
+-    { 0x00009b1c, 0x00000009 },
+-    { 0x00009b20, 0x0000000a },
+-    { 0x00009b24, 0x0000000b },
+-    { 0x00009b28, 0x0000000c },
+-    { 0x00009b2c, 0x0000000d },
+-    { 0x00009b30, 0x00000010 },
+-    { 0x00009b34, 0x00000011 },
+-    { 0x00009b38, 0x00000012 },
+-    { 0x00009b3c, 0x00000013 },
+-    { 0x00009b40, 0x00000014 },
+-    { 0x00009b44, 0x00000015 },
+-    { 0x00009b48, 0x00000018 },
+-    { 0x00009b4c, 0x00000019 },
+-    { 0x00009b50, 0x0000001a },
+-    { 0x00009b54, 0x0000001b },
+-    { 0x00009b58, 0x0000001c },
+-    { 0x00009b5c, 0x0000001d },
+-    { 0x00009b60, 0x00000020 },
+-    { 0x00009b64, 0x00000021 },
+-    { 0x00009b68, 0x00000022 },
+-    { 0x00009b6c, 0x00000023 },
+-    { 0x00009b70, 0x00000024 },
+-    { 0x00009b74, 0x00000025 },
+-    { 0x00009b78, 0x00000028 },
+-    { 0x00009b7c, 0x00000029 },
+-    { 0x00009b80, 0x0000002a },
+-    { 0x00009b84, 0x0000002b },
+-    { 0x00009b88, 0x0000002c },
+-    { 0x00009b8c, 0x0000002d },
+-    { 0x00009b90, 0x00000030 },
+-    { 0x00009b94, 0x00000031 },
+-    { 0x00009b98, 0x00000032 },
+-    { 0x00009b9c, 0x00000033 },
+-    { 0x00009ba0, 0x00000034 },
+-    { 0x00009ba4, 0x00000035 },
+-    { 0x00009ba8, 0x00000035 },
+-    { 0x00009bac, 0x00000035 },
+-    { 0x00009bb0, 0x00000035 },
+-    { 0x00009bb4, 0x00000035 },
+-    { 0x00009bb8, 0x00000035 },
+-    { 0x00009bbc, 0x00000035 },
+-    { 0x00009bc0, 0x00000035 },
+-    { 0x00009bc4, 0x00000035 },
+-    { 0x00009bc8, 0x00000035 },
+-    { 0x00009bcc, 0x00000035 },
+-    { 0x00009bd0, 0x00000035 },
+-    { 0x00009bd4, 0x00000035 },
+-    { 0x00009bd8, 0x00000035 },
+-    { 0x00009bdc, 0x00000035 },
+-    { 0x00009be0, 0x00000035 },
+-    { 0x00009be4, 0x00000035 },
+-    { 0x00009be8, 0x00000035 },
+-    { 0x00009bec, 0x00000035 },
+-    { 0x00009bf0, 0x00000035 },
+-    { 0x00009bf4, 0x00000035 },
+-    { 0x00009bf8, 0x00000010 },
+-    { 0x00009bfc, 0x0000001a },
+-    { 0x0000a210, 0x40806333 },
+-    { 0x0000a214, 0x00106c10 },
+-    { 0x0000a218, 0x009c4060 },
+-    { 0x0000a220, 0x018830c6 },
+-    { 0x0000a224, 0x00000400 },
+-    { 0x0000a228, 0x001a0bb5 },
+-    { 0x0000a22c, 0x00000000 },
+-    { 0x0000a234, 0x20202020 },
+-    { 0x0000a238, 0x20202020 },
+-    { 0x0000a23c, 0x13c889ae },
+-    { 0x0000a240, 0x38490a20 },
+-    { 0x0000a244, 0x00007bb6 },
+-    { 0x0000a248, 0x0fff3ffc },
+-    { 0x0000a24c, 0x00000001 },
+-    { 0x0000a250, 0x0000a000 },
+-    { 0x0000a254, 0x00000000 },
+-    { 0x0000a258, 0x0cc75380 },
+-    { 0x0000a25c, 0x0f0f0f01 },
+-    { 0x0000a260, 0xdfa91f01 },
+-    { 0x0000a268, 0x00000001 },
+-    { 0x0000a26c, 0x0ebae9c6 },
+-    { 0x0000b26c, 0x0ebae9c6 },
+-    { 0x0000c26c, 0x0ebae9c6 },
+-    { 0x0000d270, 0x00820820 },
+-    { 0x0000a278, 0x1ce739ce },
+-    { 0x0000a27c, 0x050701ce },
+-    { 0x0000a338, 0x00000000 },
+-    { 0x0000a33c, 0x00000000 },
+-    { 0x0000a340, 0x00000000 },
+-    { 0x0000a344, 0x00000000 },
+-    { 0x0000a348, 0x3fffffff },
+-    { 0x0000a34c, 0x3fffffff },
+-    { 0x0000a350, 0x3fffffff },
+-    { 0x0000a354, 0x0003ffff },
+-    { 0x0000a358, 0x79a8aa33 },
+-    { 0x0000d35c, 0x07ffffef },
+-    { 0x0000d360, 0x0fffffe7 },
+-    { 0x0000d364, 0x17ffffe5 },
+-    { 0x0000d368, 0x1fffffe4 },
+-    { 0x0000d36c, 0x37ffffe3 },
+-    { 0x0000d370, 0x3fffffe3 },
+-    { 0x0000d374, 0x57ffffe3 },
+-    { 0x0000d378, 0x5fffffe2 },
+-    { 0x0000d37c, 0x7fffffe2 },
+-    { 0x0000d380, 0x7f3c7bba },
+-    { 0x0000d384, 0xf3307ff0 },
+-    { 0x0000a388, 0x0c000000 },
+-    { 0x0000a38c, 0x20202020 },
+-    { 0x0000a390, 0x20202020 },
+-    { 0x0000a394, 0x1ce739ce },
+-    { 0x0000a398, 0x000001ce },
+-    { 0x0000a39c, 0x00000001 },
+-    { 0x0000a3a0, 0x00000000 },
+-    { 0x0000a3a4, 0x00000000 },
+-    { 0x0000a3a8, 0x00000000 },
+-    { 0x0000a3ac, 0x00000000 },
+-    { 0x0000a3b0, 0x00000000 },
+-    { 0x0000a3b4, 0x00000000 },
+-    { 0x0000a3b8, 0x00000000 },
+-    { 0x0000a3bc, 0x00000000 },
+-    { 0x0000a3c0, 0x00000000 },
+-    { 0x0000a3c4, 0x00000000 },
+-    { 0x0000a3c8, 0x00000246 },
+-    { 0x0000a3cc, 0x20202020 },
+-    { 0x0000a3d0, 0x20202020 },
+-    { 0x0000a3d4, 0x20202020 },
+-    { 0x0000a3dc, 0x1ce739ce },
+-    { 0x0000a3e0, 0x000001ce },
++      /* Addr      allmodes  */
++      {0x0000000c, 0x00000000},
++      {0x00000030, 0x00020015},
++      {0x00000034, 0x00000005},
++      {0x00000040, 0x00000000},
++      {0x00000044, 0x00000008},
++      {0x00000048, 0x00000008},
++      {0x0000004c, 0x00000010},
++      {0x00000050, 0x00000000},
++      {0x00000054, 0x0000001f},
++      {0x00000800, 0x00000000},
++      {0x00000804, 0x00000000},
++      {0x00000808, 0x00000000},
++      {0x0000080c, 0x00000000},
++      {0x00000810, 0x00000000},
++      {0x00000814, 0x00000000},
++      {0x00000818, 0x00000000},
++      {0x0000081c, 0x00000000},
++      {0x00000820, 0x00000000},
++      {0x00000824, 0x00000000},
++      {0x00001040, 0x002ffc0f},
++      {0x00001044, 0x002ffc0f},
++      {0x00001048, 0x002ffc0f},
++      {0x0000104c, 0x002ffc0f},
++      {0x00001050, 0x002ffc0f},
++      {0x00001054, 0x002ffc0f},
++      {0x00001058, 0x002ffc0f},
++      {0x0000105c, 0x002ffc0f},
++      {0x00001060, 0x002ffc0f},
++      {0x00001064, 0x002ffc0f},
++      {0x00001230, 0x00000000},
++      {0x00001270, 0x00000000},
++      {0x00001038, 0x00000000},
++      {0x00001078, 0x00000000},
++      {0x000010b8, 0x00000000},
++      {0x000010f8, 0x00000000},
++      {0x00001138, 0x00000000},
++      {0x00001178, 0x00000000},
++      {0x000011b8, 0x00000000},
++      {0x000011f8, 0x00000000},
++      {0x00001238, 0x00000000},
++      {0x00001278, 0x00000000},
++      {0x000012b8, 0x00000000},
++      {0x000012f8, 0x00000000},
++      {0x00001338, 0x00000000},
++      {0x00001378, 0x00000000},
++      {0x000013b8, 0x00000000},
++      {0x000013f8, 0x00000000},
++      {0x00001438, 0x00000000},
++      {0x00001478, 0x00000000},
++      {0x000014b8, 0x00000000},
++      {0x000014f8, 0x00000000},
++      {0x00001538, 0x00000000},
++      {0x00001578, 0x00000000},
++      {0x000015b8, 0x00000000},
++      {0x000015f8, 0x00000000},
++      {0x00001638, 0x00000000},
++      {0x00001678, 0x00000000},
++      {0x000016b8, 0x00000000},
++      {0x000016f8, 0x00000000},
++      {0x00001738, 0x00000000},
++      {0x00001778, 0x00000000},
++      {0x000017b8, 0x00000000},
++      {0x000017f8, 0x00000000},
++      {0x0000103c, 0x00000000},
++      {0x0000107c, 0x00000000},
++      {0x000010bc, 0x00000000},
++      {0x000010fc, 0x00000000},
++      {0x0000113c, 0x00000000},
++      {0x0000117c, 0x00000000},
++      {0x000011bc, 0x00000000},
++      {0x000011fc, 0x00000000},
++      {0x0000123c, 0x00000000},
++      {0x0000127c, 0x00000000},
++      {0x000012bc, 0x00000000},
++      {0x000012fc, 0x00000000},
++      {0x0000133c, 0x00000000},
++      {0x0000137c, 0x00000000},
++      {0x000013bc, 0x00000000},
++      {0x000013fc, 0x00000000},
++      {0x0000143c, 0x00000000},
++      {0x0000147c, 0x00000000},
++      {0x00020010, 0x00000003},
++      {0x00020038, 0x000004c2},
++      {0x00008004, 0x00000000},
++      {0x00008008, 0x00000000},
++      {0x0000800c, 0x00000000},
++      {0x00008018, 0x00000700},
++      {0x00008020, 0x00000000},
++      {0x00008038, 0x00000000},
++      {0x0000803c, 0x00000000},
++      {0x00008048, 0x40000000},
++      {0x00008054, 0x00004000},
++      {0x00008058, 0x00000000},
++      {0x0000805c, 0x000fc78f},
++      {0x00008060, 0x0000000f},
++      {0x00008064, 0x00000000},
++      {0x000080c0, 0x2a82301a},
++      {0x000080c4, 0x05dc01e0},
++      {0x000080c8, 0x1f402710},
++      {0x000080cc, 0x01f40000},
++      {0x000080d0, 0x00001e00},
++      {0x000080d4, 0x00000000},
++      {0x000080d8, 0x00400000},
++      {0x000080e0, 0xffffffff},
++      {0x000080e4, 0x0000ffff},
++      {0x000080e8, 0x003f3f3f},
++      {0x000080ec, 0x00000000},
++      {0x000080f0, 0x00000000},
++      {0x000080f4, 0x00000000},
++      {0x000080f8, 0x00000000},
++      {0x000080fc, 0x00020000},
++      {0x00008100, 0x00020000},
++      {0x00008104, 0x00000001},
++      {0x00008108, 0x00000052},
++      {0x0000810c, 0x00000000},
++      {0x00008110, 0x00000168},
++      {0x00008118, 0x000100aa},
++      {0x0000811c, 0x00003210},
++      {0x00008120, 0x08f04800},
++      {0x00008124, 0x00000000},
++      {0x00008128, 0x00000000},
++      {0x0000812c, 0x00000000},
++      {0x00008130, 0x00000000},
++      {0x00008134, 0x00000000},
++      {0x00008138, 0x00000000},
++      {0x0000813c, 0x00000000},
++      {0x00008144, 0x00000000},
++      {0x00008168, 0x00000000},
++      {0x0000816c, 0x00000000},
++      {0x00008170, 0x32143320},
++      {0x00008174, 0xfaa4fa50},
++      {0x00008178, 0x00000100},
++      {0x0000817c, 0x00000000},
++      {0x000081c4, 0x00000000},
++      {0x000081d0, 0x00003210},
++      {0x000081ec, 0x00000000},
++      {0x000081f0, 0x00000000},
++      {0x000081f4, 0x00000000},
++      {0x000081f8, 0x00000000},
++      {0x000081fc, 0x00000000},
++      {0x00008200, 0x00000000},
++      {0x00008204, 0x00000000},
++      {0x00008208, 0x00000000},
++      {0x0000820c, 0x00000000},
++      {0x00008210, 0x00000000},
++      {0x00008214, 0x00000000},
++      {0x00008218, 0x00000000},
++      {0x0000821c, 0x00000000},
++      {0x00008220, 0x00000000},
++      {0x00008224, 0x00000000},
++      {0x00008228, 0x00000000},
++      {0x0000822c, 0x00000000},
++      {0x00008230, 0x00000000},
++      {0x00008234, 0x00000000},
++      {0x00008238, 0x00000000},
++      {0x0000823c, 0x00000000},
++      {0x00008240, 0x00100000},
++      {0x00008244, 0x0010f400},
++      {0x00008248, 0x00000100},
++      {0x0000824c, 0x0001e800},
++      {0x00008250, 0x00000000},
++      {0x00008254, 0x00000000},
++      {0x00008258, 0x00000000},
++      {0x0000825c, 0x400000ff},
++      {0x00008260, 0x00080922},
++      {0x00008270, 0x00000000},
++      {0x00008274, 0x40000000},
++      {0x00008278, 0x003e4180},
++      {0x0000827c, 0x00000000},
++      {0x00008284, 0x0000002c},
++      {0x00008288, 0x0000002c},
++      {0x0000828c, 0x00000000},
++      {0x00008294, 0x00000000},
++      {0x00008298, 0x00000000},
++      {0x00008300, 0x00000000},
++      {0x00008304, 0x00000000},
++      {0x00008308, 0x00000000},
++      {0x0000830c, 0x00000000},
++      {0x00008310, 0x00000000},
++      {0x00008314, 0x00000000},
++      {0x00008318, 0x00000000},
++      {0x00008328, 0x00000000},
++      {0x0000832c, 0x00000007},
++      {0x00008330, 0x00000302},
++      {0x00008334, 0x00000e00},
++      {0x00008338, 0x00000000},
++      {0x0000833c, 0x00000000},
++      {0x00008340, 0x000107ff},
++      {0x00009808, 0x00000000},
++      {0x0000980c, 0xad848e19},
++      {0x00009810, 0x7d14e000},
++      {0x00009814, 0x9c0a9f6b},
++      {0x0000981c, 0x00000000},
++      {0x0000982c, 0x0000a000},
++      {0x00009830, 0x00000000},
++      {0x0000983c, 0x00200400},
++      {0x00009840, 0x206a01ae},
++      {0x0000984c, 0x1284233c},
++      {0x00009854, 0x00000859},
++      {0x00009900, 0x00000000},
++      {0x00009904, 0x00000000},
++      {0x00009908, 0x00000000},
++      {0x0000990c, 0x00000000},
++      {0x0000991c, 0x10000fff},
++      {0x00009920, 0x05100000},
++      {0x0000a920, 0x05100000},
++      {0x0000b920, 0x05100000},
++      {0x00009928, 0x00000001},
++      {0x0000992c, 0x00000004},
++      {0x00009934, 0x1e1f2022},
++      {0x00009938, 0x0a0b0c0d},
++      {0x0000993c, 0x00000000},
++      {0x00009948, 0x9280b212},
++      {0x0000994c, 0x00020028},
++      {0x0000c95c, 0x004b6a8e},
++      {0x0000c968, 0x000003ce},
++      {0x00009970, 0x190fb515},
++      {0x00009974, 0x00000000},
++      {0x00009978, 0x00000001},
++      {0x0000997c, 0x00000000},
++      {0x00009980, 0x00000000},
++      {0x00009984, 0x00000000},
++      {0x00009988, 0x00000000},
++      {0x0000998c, 0x00000000},
++      {0x00009990, 0x00000000},
++      {0x00009994, 0x00000000},
++      {0x00009998, 0x00000000},
++      {0x0000999c, 0x00000000},
++      {0x000099a0, 0x00000000},
++      {0x000099a4, 0x00000001},
++      {0x000099a8, 0x201fff00},
++      {0x000099ac, 0x006f0000},
++      {0x000099b0, 0x03051000},
++      {0x000099dc, 0x00000000},
++      {0x000099e0, 0x00000200},
++      {0x000099e4, 0xaaaaaaaa},
++      {0x000099e8, 0x3c466478},
++      {0x000099ec, 0x0cc80caa},
++      {0x000099fc, 0x00001042},
++      {0x00009b00, 0x00000000},
++      {0x00009b04, 0x00000001},
++      {0x00009b08, 0x00000002},
++      {0x00009b0c, 0x00000003},
++      {0x00009b10, 0x00000004},
++      {0x00009b14, 0x00000005},
++      {0x00009b18, 0x00000008},
++      {0x00009b1c, 0x00000009},
++      {0x00009b20, 0x0000000a},
++      {0x00009b24, 0x0000000b},
++      {0x00009b28, 0x0000000c},
++      {0x00009b2c, 0x0000000d},
++      {0x00009b30, 0x00000010},
++      {0x00009b34, 0x00000011},
++      {0x00009b38, 0x00000012},
++      {0x00009b3c, 0x00000013},
++      {0x00009b40, 0x00000014},
++      {0x00009b44, 0x00000015},
++      {0x00009b48, 0x00000018},
++      {0x00009b4c, 0x00000019},
++      {0x00009b50, 0x0000001a},
++      {0x00009b54, 0x0000001b},
++      {0x00009b58, 0x0000001c},
++      {0x00009b5c, 0x0000001d},
++      {0x00009b60, 0x00000020},
++      {0x00009b64, 0x00000021},
++      {0x00009b68, 0x00000022},
++      {0x00009b6c, 0x00000023},
++      {0x00009b70, 0x00000024},
++      {0x00009b74, 0x00000025},
++      {0x00009b78, 0x00000028},
++      {0x00009b7c, 0x00000029},
++      {0x00009b80, 0x0000002a},
++      {0x00009b84, 0x0000002b},
++      {0x00009b88, 0x0000002c},
++      {0x00009b8c, 0x0000002d},
++      {0x00009b90, 0x00000030},
++      {0x00009b94, 0x00000031},
++      {0x00009b98, 0x00000032},
++      {0x00009b9c, 0x00000033},
++      {0x00009ba0, 0x00000034},
++      {0x00009ba4, 0x00000035},
++      {0x00009ba8, 0x00000035},
++      {0x00009bac, 0x00000035},
++      {0x00009bb0, 0x00000035},
++      {0x00009bb4, 0x00000035},
++      {0x00009bb8, 0x00000035},
++      {0x00009bbc, 0x00000035},
++      {0x00009bc0, 0x00000035},
++      {0x00009bc4, 0x00000035},
++      {0x00009bc8, 0x00000035},
++      {0x00009bcc, 0x00000035},
++      {0x00009bd0, 0x00000035},
++      {0x00009bd4, 0x00000035},
++      {0x00009bd8, 0x00000035},
++      {0x00009bdc, 0x00000035},
++      {0x00009be0, 0x00000035},
++      {0x00009be4, 0x00000035},
++      {0x00009be8, 0x00000035},
++      {0x00009bec, 0x00000035},
++      {0x00009bf0, 0x00000035},
++      {0x00009bf4, 0x00000035},
++      {0x00009bf8, 0x00000010},
++      {0x00009bfc, 0x0000001a},
++      {0x0000a210, 0x40806333},
++      {0x0000a214, 0x00106c10},
++      {0x0000a218, 0x009c4060},
++      {0x0000a220, 0x018830c6},
++      {0x0000a224, 0x00000400},
++      {0x0000a228, 0x001a0bb5},
++      {0x0000a22c, 0x00000000},
++      {0x0000a234, 0x20202020},
++      {0x0000a238, 0x20202020},
++      {0x0000a23c, 0x13c889ae},
++      {0x0000a240, 0x38490a20},
++      {0x0000a244, 0x00007bb6},
++      {0x0000a248, 0x0fff3ffc},
++      {0x0000a24c, 0x00000001},
++      {0x0000a250, 0x0000a000},
++      {0x0000a254, 0x00000000},
++      {0x0000a258, 0x0cc75380},
++      {0x0000a25c, 0x0f0f0f01},
++      {0x0000a260, 0xdfa91f01},
++      {0x0000a268, 0x00000001},
++      {0x0000a26c, 0x0ebae9c6},
++      {0x0000b26c, 0x0ebae9c6},
++      {0x0000c26c, 0x0ebae9c6},
++      {0x0000d270, 0x00820820},
++      {0x0000a278, 0x1ce739ce},
++      {0x0000a27c, 0x050701ce},
++      {0x0000a338, 0x00000000},
++      {0x0000a33c, 0x00000000},
++      {0x0000a340, 0x00000000},
++      {0x0000a344, 0x00000000},
++      {0x0000a348, 0x3fffffff},
++      {0x0000a34c, 0x3fffffff},
++      {0x0000a350, 0x3fffffff},
++      {0x0000a354, 0x0003ffff},
++      {0x0000a358, 0x79a8aa33},
++      {0x0000d35c, 0x07ffffef},
++      {0x0000d360, 0x0fffffe7},
++      {0x0000d364, 0x17ffffe5},
++      {0x0000d368, 0x1fffffe4},
++      {0x0000d36c, 0x37ffffe3},
++      {0x0000d370, 0x3fffffe3},
++      {0x0000d374, 0x57ffffe3},
++      {0x0000d378, 0x5fffffe2},
++      {0x0000d37c, 0x7fffffe2},
++      {0x0000d380, 0x7f3c7bba},
++      {0x0000d384, 0xf3307ff0},
++      {0x0000a388, 0x0c000000},
++      {0x0000a38c, 0x20202020},
++      {0x0000a390, 0x20202020},
++      {0x0000a394, 0x1ce739ce},
++      {0x0000a398, 0x000001ce},
++      {0x0000a39c, 0x00000001},
++      {0x0000a3a0, 0x00000000},
++      {0x0000a3a4, 0x00000000},
++      {0x0000a3a8, 0x00000000},
++      {0x0000a3ac, 0x00000000},
++      {0x0000a3b0, 0x00000000},
++      {0x0000a3b4, 0x00000000},
++      {0x0000a3b8, 0x00000000},
++      {0x0000a3bc, 0x00000000},
++      {0x0000a3c0, 0x00000000},
++      {0x0000a3c4, 0x00000000},
++      {0x0000a3c8, 0x00000246},
++      {0x0000a3cc, 0x20202020},
++      {0x0000a3d0, 0x20202020},
++      {0x0000a3d4, 0x20202020},
++      {0x0000a3dc, 0x1ce739ce},
++      {0x0000a3e0, 0x000001ce},
+ };
+ static const u32 ar5416Bank0_9100[][2] = {
+-    { 0x000098b0, 0x1e5795e5 },
+-    { 0x000098e0, 0x02008020 },
++      /* Addr      allmodes  */
++      {0x000098b0, 0x1e5795e5},
++      {0x000098e0, 0x02008020},
+ };
+ static const u32 ar5416BB_RfGain_9100[][3] = {
+-    { 0x00009a00, 0x00000000, 0x00000000 },
+-    { 0x00009a04, 0x00000040, 0x00000040 },
+-    { 0x00009a08, 0x00000080, 0x00000080 },
+-    { 0x00009a0c, 0x000001a1, 0x00000141 },
+-    { 0x00009a10, 0x000001e1, 0x00000181 },
+-    { 0x00009a14, 0x00000021, 0x000001c1 },
+-    { 0x00009a18, 0x00000061, 0x00000001 },
+-    { 0x00009a1c, 0x00000168, 0x00000041 },
+-    { 0x00009a20, 0x000001a8, 0x000001a8 },
+-    { 0x00009a24, 0x000001e8, 0x000001e8 },
+-    { 0x00009a28, 0x00000028, 0x00000028 },
+-    { 0x00009a2c, 0x00000068, 0x00000068 },
+-    { 0x00009a30, 0x00000189, 0x000000a8 },
+-    { 0x00009a34, 0x000001c9, 0x00000169 },
+-    { 0x00009a38, 0x00000009, 0x000001a9 },
+-    { 0x00009a3c, 0x00000049, 0x000001e9 },
+-    { 0x00009a40, 0x00000089, 0x00000029 },
+-    { 0x00009a44, 0x00000170, 0x00000069 },
+-    { 0x00009a48, 0x000001b0, 0x00000190 },
+-    { 0x00009a4c, 0x000001f0, 0x000001d0 },
+-    { 0x00009a50, 0x00000030, 0x00000010 },
+-    { 0x00009a54, 0x00000070, 0x00000050 },
+-    { 0x00009a58, 0x00000191, 0x00000090 },
+-    { 0x00009a5c, 0x000001d1, 0x00000151 },
+-    { 0x00009a60, 0x00000011, 0x00000191 },
+-    { 0x00009a64, 0x00000051, 0x000001d1 },
+-    { 0x00009a68, 0x00000091, 0x00000011 },
+-    { 0x00009a6c, 0x000001b8, 0x00000051 },
+-    { 0x00009a70, 0x000001f8, 0x00000198 },
+-    { 0x00009a74, 0x00000038, 0x000001d8 },
+-    { 0x00009a78, 0x00000078, 0x00000018 },
+-    { 0x00009a7c, 0x00000199, 0x00000058 },
+-    { 0x00009a80, 0x000001d9, 0x00000098 },
+-    { 0x00009a84, 0x00000019, 0x00000159 },
+-    { 0x00009a88, 0x00000059, 0x00000199 },
+-    { 0x00009a8c, 0x00000099, 0x000001d9 },
+-    { 0x00009a90, 0x000000d9, 0x00000019 },
+-    { 0x00009a94, 0x000000f9, 0x00000059 },
+-    { 0x00009a98, 0x000000f9, 0x00000099 },
+-    { 0x00009a9c, 0x000000f9, 0x000000d9 },
+-    { 0x00009aa0, 0x000000f9, 0x000000f9 },
+-    { 0x00009aa4, 0x000000f9, 0x000000f9 },
+-    { 0x00009aa8, 0x000000f9, 0x000000f9 },
+-    { 0x00009aac, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab8, 0x000000f9, 0x000000f9 },
+-    { 0x00009abc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac8, 0x000000f9, 0x000000f9 },
+-    { 0x00009acc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad8, 0x000000f9, 0x000000f9 },
+-    { 0x00009adc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae8, 0x000000f9, 0x000000f9 },
+-    { 0x00009aec, 0x000000f9, 0x000000f9 },
+-    { 0x00009af0, 0x000000f9, 0x000000f9 },
+-    { 0x00009af4, 0x000000f9, 0x000000f9 },
+-    { 0x00009af8, 0x000000f9, 0x000000f9 },
+-    { 0x00009afc, 0x000000f9, 0x000000f9 },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x00009a00, 0x00000000, 0x00000000},
++      {0x00009a04, 0x00000040, 0x00000040},
++      {0x00009a08, 0x00000080, 0x00000080},
++      {0x00009a0c, 0x000001a1, 0x00000141},
++      {0x00009a10, 0x000001e1, 0x00000181},
++      {0x00009a14, 0x00000021, 0x000001c1},
++      {0x00009a18, 0x00000061, 0x00000001},
++      {0x00009a1c, 0x00000168, 0x00000041},
++      {0x00009a20, 0x000001a8, 0x000001a8},
++      {0x00009a24, 0x000001e8, 0x000001e8},
++      {0x00009a28, 0x00000028, 0x00000028},
++      {0x00009a2c, 0x00000068, 0x00000068},
++      {0x00009a30, 0x00000189, 0x000000a8},
++      {0x00009a34, 0x000001c9, 0x00000169},
++      {0x00009a38, 0x00000009, 0x000001a9},
++      {0x00009a3c, 0x00000049, 0x000001e9},
++      {0x00009a40, 0x00000089, 0x00000029},
++      {0x00009a44, 0x00000170, 0x00000069},
++      {0x00009a48, 0x000001b0, 0x00000190},
++      {0x00009a4c, 0x000001f0, 0x000001d0},
++      {0x00009a50, 0x00000030, 0x00000010},
++      {0x00009a54, 0x00000070, 0x00000050},
++      {0x00009a58, 0x00000191, 0x00000090},
++      {0x00009a5c, 0x000001d1, 0x00000151},
++      {0x00009a60, 0x00000011, 0x00000191},
++      {0x00009a64, 0x00000051, 0x000001d1},
++      {0x00009a68, 0x00000091, 0x00000011},
++      {0x00009a6c, 0x000001b8, 0x00000051},
++      {0x00009a70, 0x000001f8, 0x00000198},
++      {0x00009a74, 0x00000038, 0x000001d8},
++      {0x00009a78, 0x00000078, 0x00000018},
++      {0x00009a7c, 0x00000199, 0x00000058},
++      {0x00009a80, 0x000001d9, 0x00000098},
++      {0x00009a84, 0x00000019, 0x00000159},
++      {0x00009a88, 0x00000059, 0x00000199},
++      {0x00009a8c, 0x00000099, 0x000001d9},
++      {0x00009a90, 0x000000d9, 0x00000019},
++      {0x00009a94, 0x000000f9, 0x00000059},
++      {0x00009a98, 0x000000f9, 0x00000099},
++      {0x00009a9c, 0x000000f9, 0x000000d9},
++      {0x00009aa0, 0x000000f9, 0x000000f9},
++      {0x00009aa4, 0x000000f9, 0x000000f9},
++      {0x00009aa8, 0x000000f9, 0x000000f9},
++      {0x00009aac, 0x000000f9, 0x000000f9},
++      {0x00009ab0, 0x000000f9, 0x000000f9},
++      {0x00009ab4, 0x000000f9, 0x000000f9},
++      {0x00009ab8, 0x000000f9, 0x000000f9},
++      {0x00009abc, 0x000000f9, 0x000000f9},
++      {0x00009ac0, 0x000000f9, 0x000000f9},
++      {0x00009ac4, 0x000000f9, 0x000000f9},
++      {0x00009ac8, 0x000000f9, 0x000000f9},
++      {0x00009acc, 0x000000f9, 0x000000f9},
++      {0x00009ad0, 0x000000f9, 0x000000f9},
++      {0x00009ad4, 0x000000f9, 0x000000f9},
++      {0x00009ad8, 0x000000f9, 0x000000f9},
++      {0x00009adc, 0x000000f9, 0x000000f9},
++      {0x00009ae0, 0x000000f9, 0x000000f9},
++      {0x00009ae4, 0x000000f9, 0x000000f9},
++      {0x00009ae8, 0x000000f9, 0x000000f9},
++      {0x00009aec, 0x000000f9, 0x000000f9},
++      {0x00009af0, 0x000000f9, 0x000000f9},
++      {0x00009af4, 0x000000f9, 0x000000f9},
++      {0x00009af8, 0x000000f9, 0x000000f9},
++      {0x00009afc, 0x000000f9, 0x000000f9},
+ };
+ static const u32 ar5416Bank1_9100[][2] = {
+-    { 0x000098b0, 0x02108421},
+-    { 0x000098ec, 0x00000008},
++      /* Addr      allmodes  */
++      {0x000098b0, 0x02108421},
++      {0x000098ec, 0x00000008},
+ };
+ static const u32 ar5416Bank2_9100[][2] = {
+-    { 0x000098b0, 0x0e73ff17},
+-    { 0x000098e0, 0x00000420},
++      /* Addr      allmodes  */
++      {0x000098b0, 0x0e73ff17},
++      {0x000098e0, 0x00000420},
+ };
+ static const u32 ar5416Bank3_9100[][3] = {
+-    { 0x000098f0, 0x01400018, 0x01c00018 },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x000098f0, 0x01400018, 0x01c00018},
+ };
+ static const u32 ar5416Bank6_9100[][3] = {
+-
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00e00000, 0x00e00000 },
+-    { 0x0000989c, 0x005e0000, 0x005e0000 },
+-    { 0x0000989c, 0x00120000, 0x00120000 },
+-    { 0x0000989c, 0x00620000, 0x00620000 },
+-    { 0x0000989c, 0x00020000, 0x00020000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x005f0000, 0x005f0000 },
+-    { 0x0000989c, 0x00870000, 0x00870000 },
+-    { 0x0000989c, 0x00f90000, 0x00f90000 },
+-    { 0x0000989c, 0x007b0000, 0x007b0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00f50000, 0x00f50000 },
+-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
+-    { 0x0000989c, 0x00110000, 0x00110000 },
+-    { 0x0000989c, 0x006100a8, 0x006100a8 },
+-    { 0x0000989c, 0x004210a2, 0x004210a2 },
+-    { 0x0000989c, 0x0014000f, 0x0014000f },
+-    { 0x0000989c, 0x00c40002, 0x00c40002 },
+-    { 0x0000989c, 0x003000f2, 0x003000f2 },
+-    { 0x0000989c, 0x00440016, 0x00440016 },
+-    { 0x0000989c, 0x00410040, 0x00410040 },
+-    { 0x0000989c, 0x000180d6, 0x000180d6 },
+-    { 0x0000989c, 0x0000c0aa, 0x0000c0aa },
+-    { 0x0000989c, 0x000000b1, 0x000000b1 },
+-    { 0x0000989c, 0x00002000, 0x00002000 },
+-    { 0x0000989c, 0x000000d4, 0x000000d4 },
+-    { 0x000098d0, 0x0000000f, 0x0010000f },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00e00000, 0x00e00000},
++      {0x0000989c, 0x005e0000, 0x005e0000},
++      {0x0000989c, 0x00120000, 0x00120000},
++      {0x0000989c, 0x00620000, 0x00620000},
++      {0x0000989c, 0x00020000, 0x00020000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x005f0000, 0x005f0000},
++      {0x0000989c, 0x00870000, 0x00870000},
++      {0x0000989c, 0x00f90000, 0x00f90000},
++      {0x0000989c, 0x007b0000, 0x007b0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00f50000, 0x00f50000},
++      {0x0000989c, 0x00dc0000, 0x00dc0000},
++      {0x0000989c, 0x00110000, 0x00110000},
++      {0x0000989c, 0x006100a8, 0x006100a8},
++      {0x0000989c, 0x004210a2, 0x004210a2},
++      {0x0000989c, 0x0014000f, 0x0014000f},
++      {0x0000989c, 0x00c40002, 0x00c40002},
++      {0x0000989c, 0x003000f2, 0x003000f2},
++      {0x0000989c, 0x00440016, 0x00440016},
++      {0x0000989c, 0x00410040, 0x00410040},
++      {0x0000989c, 0x000180d6, 0x000180d6},
++      {0x0000989c, 0x0000c0aa, 0x0000c0aa},
++      {0x0000989c, 0x000000b1, 0x000000b1},
++      {0x0000989c, 0x00002000, 0x00002000},
++      {0x0000989c, 0x000000d4, 0x000000d4},
++      {0x000098d0, 0x0000000f, 0x0010000f},
+ };
+-
+ static const u32 ar5416Bank6TPC_9100[][3] = {
+-
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00e00000, 0x00e00000 },
+-    { 0x0000989c, 0x005e0000, 0x005e0000 },
+-    { 0x0000989c, 0x00120000, 0x00120000 },
+-    { 0x0000989c, 0x00620000, 0x00620000 },
+-    { 0x0000989c, 0x00020000, 0x00020000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
+-    { 0x0000989c, 0x005f0000, 0x005f0000 },
+-    { 0x0000989c, 0x00870000, 0x00870000 },
+-    { 0x0000989c, 0x00f90000, 0x00f90000 },
+-    { 0x0000989c, 0x007b0000, 0x007b0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00f50000, 0x00f50000 },
+-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
+-    { 0x0000989c, 0x00110000, 0x00110000 },
+-    { 0x0000989c, 0x006100a8, 0x006100a8 },
+-    { 0x0000989c, 0x00423022, 0x00423022 },
+-    { 0x0000989c, 0x2014008f, 0x2014008f },
+-    { 0x0000989c, 0x00c40002, 0x00c40002 },
+-    { 0x0000989c, 0x003000f2, 0x003000f2 },
+-    { 0x0000989c, 0x00440016, 0x00440016 },
+-    { 0x0000989c, 0x00410040, 0x00410040 },
+-    { 0x0000989c, 0x0001805e, 0x0001805e },
+-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
+-    { 0x0000989c, 0x000000e1, 0x000000e1 },
+-    { 0x0000989c, 0x00007080, 0x00007080 },
+-    { 0x0000989c, 0x000000d4, 0x000000d4 },
+-    { 0x000098d0, 0x0000000f, 0x0010000f },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00e00000, 0x00e00000},
++      {0x0000989c, 0x005e0000, 0x005e0000},
++      {0x0000989c, 0x00120000, 0x00120000},
++      {0x0000989c, 0x00620000, 0x00620000},
++      {0x0000989c, 0x00020000, 0x00020000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x40ff0000, 0x40ff0000},
++      {0x0000989c, 0x005f0000, 0x005f0000},
++      {0x0000989c, 0x00870000, 0x00870000},
++      {0x0000989c, 0x00f90000, 0x00f90000},
++      {0x0000989c, 0x007b0000, 0x007b0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00f50000, 0x00f50000},
++      {0x0000989c, 0x00dc0000, 0x00dc0000},
++      {0x0000989c, 0x00110000, 0x00110000},
++      {0x0000989c, 0x006100a8, 0x006100a8},
++      {0x0000989c, 0x00423022, 0x00423022},
++      {0x0000989c, 0x2014008f, 0x2014008f},
++      {0x0000989c, 0x00c40002, 0x00c40002},
++      {0x0000989c, 0x003000f2, 0x003000f2},
++      {0x0000989c, 0x00440016, 0x00440016},
++      {0x0000989c, 0x00410040, 0x00410040},
++      {0x0000989c, 0x0001805e, 0x0001805e},
++      {0x0000989c, 0x0000c0ab, 0x0000c0ab},
++      {0x0000989c, 0x000000e1, 0x000000e1},
++      {0x0000989c, 0x00007080, 0x00007080},
++      {0x0000989c, 0x000000d4, 0x000000d4},
++      {0x000098d0, 0x0000000f, 0x0010000f},
+ };
+ static const u32 ar5416Bank7_9100[][2] = {
+-    { 0x0000989c, 0x00000500 },
+-    { 0x0000989c, 0x00000800 },
+-    { 0x000098cc, 0x0000000e },
++      /* Addr      allmodes  */
++      {0x0000989c, 0x00000500},
++      {0x0000989c, 0x00000800},
++      {0x000098cc, 0x0000000e},
+ };
+ static const u32 ar5416Addac_9100[][2] = {
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000010 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x000000c0 },
+-    {0x0000989c, 0x00000015 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x0000989c, 0x00000000 },
+-    {0x000098cc, 0x00000000 },
++      /* Addr      allmodes  */
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000010},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x000000c0},
++      {0x0000989c, 0x00000015},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x000098cc, 0x00000000},
+ };
+ static const u32 ar5416Modes_9160[][6] = {
+-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
+-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
+-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
+-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
+-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
+-    { 0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf },
+-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
+-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
+-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
+-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
+-    { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 },
+-    { 0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68 },
+-    { 0x00009850, 0x6c48b4e2, 0x6c48b4e2, 0x6c48b0e2, 0x6c48b0e2, 0x6c48b0e2 },
+-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e },
+-    { 0x0000985c, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e },
+-    { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 },
+-    { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
+-    { 0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0 },
+-    { 0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 },
+-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
+-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
+-    { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
+-    { 0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020 },
+-    { 0x00009960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 },
+-    { 0x0000a960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 },
+-    { 0x0000b960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40 },
+-    { 0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120 },
+-    { 0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce },
+-    { 0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a0c00, 0x001a0c00, 0x001a0c00 },
+-    { 0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be },
+-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
+-    { 0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329 },
+-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
+-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
+-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880 },
+-    { 0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788 },
+-    { 0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120 },
+-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
+-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
+-    { 0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa },
+-    { 0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 },
+-    { 0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402 },
+-    { 0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06 },
+-    { 0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b },
+-    { 0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b },
+-    { 0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a },
+-    { 0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf },
+-    { 0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f },
+-    { 0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f },
+-    { 0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f },
+-    { 0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
++      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
++      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
++      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
++      {0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},
++      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
++      {0x0000801c, 0x128d93a7, 0x128d93cf, 0x12e013d7, 0x12e013ab, 0x098813cf},
++      {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
++      {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
++      {0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
++      {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
++      {0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0},
++      {0x00009848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x0000a848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x0000b848, 0x001a6a65, 0x001a6a65, 0x00197a68, 0x00197a68, 0x00197a68},
++      {0x00009850, 0x6c48b4e2, 0x6c48b4e2, 0x6c48b0e2, 0x6c48b0e2, 0x6c48b0e2},
++      {0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},
++      {0x0000985c, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e, 0x31395d5e},
++      {0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18},
++      {0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
++      {0x00009868, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0, 0x409a40d0},
++      {0x0000986c, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081},
++      {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
++      {0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016},
++      {0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d},
++      {0x00009944, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020, 0xffb81020},
++      {0x00009960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40},
++      {0x0000a960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40},
++      {0x0000b960, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40, 0x00009b40},
++      {0x00009964, 0x00001120, 0x00001120, 0x00001120, 0x00001120, 0x00001120},
++      {0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce},
++      {0x0000c9bc, 0x001a0600, 0x001a0600, 0x001a0c00, 0x001a0c00, 0x001a0c00},
++      {0x000099c0, 0x038919be, 0x038919be, 0x038919be, 0x038919be, 0x038919be},
++      {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
++      {0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329},
++      {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
++      {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
++      {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a204, 0x00000880, 0x00000880, 0x00000880, 0x00000880, 0x00000880},
++      {0x0000a208, 0xd6be4788, 0xd6be4788, 0xd03e4788, 0xd03e4788, 0xd03e4788},
++      {0x0000a20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000b20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000c20c, 0x002fc160, 0x002fc160, 0x002ac120, 0x002ac120, 0x002ac120},
++      {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
++      {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
++      {0x0000a274, 0x0a1a9caa, 0x0a1a9caa, 0x0a1a7caa, 0x0a1a7caa, 0x0a1a7caa},
++      {0x0000a300, 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000},
++      {0x0000a304, 0x30032602, 0x30032602, 0x2e032402, 0x2e032402, 0x2e032402},
++      {0x0000a308, 0x48073e06, 0x48073e06, 0x4a0a3c06, 0x4a0a3c06, 0x4a0a3c06},
++      {0x0000a30c, 0x560b4c0a, 0x560b4c0a, 0x621a540b, 0x621a540b, 0x621a540b},
++      {0x0000a310, 0x641a600f, 0x641a600f, 0x764f6c1b, 0x764f6c1b, 0x764f6c1b},
++      {0x0000a314, 0x7a4f6e1b, 0x7a4f6e1b, 0x845b7a5a, 0x845b7a5a, 0x845b7a5a},
++      {0x0000a318, 0x8c5b7e5a, 0x8c5b7e5a, 0x950f8ccf, 0x950f8ccf, 0x950f8ccf},
++      {0x0000a31c, 0x9d0f96cf, 0x9d0f96cf, 0xa5cf9b4f, 0xa5cf9b4f, 0xa5cf9b4f},
++      {0x0000a320, 0xb51fa69f, 0xb51fa69f, 0xbddfaf1f, 0xbddfaf1f, 0xbddfaf1f},
++      {0x0000a324, 0xcb3fbd07, 0xcb3fbcbf, 0xd1ffc93f, 0xd1ffc93f, 0xd1ffc93f},
++      {0x0000a328, 0x0000d7bf, 0x0000d7bf, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a32c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a330, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a334, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ };
+ static const u32 ar5416Common_9160[][2] = {
+-    { 0x0000000c, 0x00000000 },
+-    { 0x00000030, 0x00020015 },
+-    { 0x00000034, 0x00000005 },
+-    { 0x00000040, 0x00000000 },
+-    { 0x00000044, 0x00000008 },
+-    { 0x00000048, 0x00000008 },
+-    { 0x0000004c, 0x00000010 },
+-    { 0x00000050, 0x00000000 },
+-    { 0x00000054, 0x0000001f },
+-    { 0x00000800, 0x00000000 },
+-    { 0x00000804, 0x00000000 },
+-    { 0x00000808, 0x00000000 },
+-    { 0x0000080c, 0x00000000 },
+-    { 0x00000810, 0x00000000 },
+-    { 0x00000814, 0x00000000 },
+-    { 0x00000818, 0x00000000 },
+-    { 0x0000081c, 0x00000000 },
+-    { 0x00000820, 0x00000000 },
+-    { 0x00000824, 0x00000000 },
+-    { 0x00001040, 0x002ffc0f },
+-    { 0x00001044, 0x002ffc0f },
+-    { 0x00001048, 0x002ffc0f },
+-    { 0x0000104c, 0x002ffc0f },
+-    { 0x00001050, 0x002ffc0f },
+-    { 0x00001054, 0x002ffc0f },
+-    { 0x00001058, 0x002ffc0f },
+-    { 0x0000105c, 0x002ffc0f },
+-    { 0x00001060, 0x002ffc0f },
+-    { 0x00001064, 0x002ffc0f },
+-    { 0x00001230, 0x00000000 },
+-    { 0x00001270, 0x00000000 },
+-    { 0x00001038, 0x00000000 },
+-    { 0x00001078, 0x00000000 },
+-    { 0x000010b8, 0x00000000 },
+-    { 0x000010f8, 0x00000000 },
+-    { 0x00001138, 0x00000000 },
+-    { 0x00001178, 0x00000000 },
+-    { 0x000011b8, 0x00000000 },
+-    { 0x000011f8, 0x00000000 },
+-    { 0x00001238, 0x00000000 },
+-    { 0x00001278, 0x00000000 },
+-    { 0x000012b8, 0x00000000 },
+-    { 0x000012f8, 0x00000000 },
+-    { 0x00001338, 0x00000000 },
+-    { 0x00001378, 0x00000000 },
+-    { 0x000013b8, 0x00000000 },
+-    { 0x000013f8, 0x00000000 },
+-    { 0x00001438, 0x00000000 },
+-    { 0x00001478, 0x00000000 },
+-    { 0x000014b8, 0x00000000 },
+-    { 0x000014f8, 0x00000000 },
+-    { 0x00001538, 0x00000000 },
+-    { 0x00001578, 0x00000000 },
+-    { 0x000015b8, 0x00000000 },
+-    { 0x000015f8, 0x00000000 },
+-    { 0x00001638, 0x00000000 },
+-    { 0x00001678, 0x00000000 },
+-    { 0x000016b8, 0x00000000 },
+-    { 0x000016f8, 0x00000000 },
+-    { 0x00001738, 0x00000000 },
+-    { 0x00001778, 0x00000000 },
+-    { 0x000017b8, 0x00000000 },
+-    { 0x000017f8, 0x00000000 },
+-    { 0x0000103c, 0x00000000 },
+-    { 0x0000107c, 0x00000000 },
+-    { 0x000010bc, 0x00000000 },
+-    { 0x000010fc, 0x00000000 },
+-    { 0x0000113c, 0x00000000 },
+-    { 0x0000117c, 0x00000000 },
+-    { 0x000011bc, 0x00000000 },
+-    { 0x000011fc, 0x00000000 },
+-    { 0x0000123c, 0x00000000 },
+-    { 0x0000127c, 0x00000000 },
+-    { 0x000012bc, 0x00000000 },
+-    { 0x000012fc, 0x00000000 },
+-    { 0x0000133c, 0x00000000 },
+-    { 0x0000137c, 0x00000000 },
+-    { 0x000013bc, 0x00000000 },
+-    { 0x000013fc, 0x00000000 },
+-    { 0x0000143c, 0x00000000 },
+-    { 0x0000147c, 0x00000000 },
+-    { 0x00004030, 0x00000002 },
+-    { 0x0000403c, 0x00000002 },
+-    { 0x00007010, 0x00000020 },
+-    { 0x00007038, 0x000004c2 },
+-    { 0x00008004, 0x00000000 },
+-    { 0x00008008, 0x00000000 },
+-    { 0x0000800c, 0x00000000 },
+-    { 0x00008018, 0x00000700 },
+-    { 0x00008020, 0x00000000 },
+-    { 0x00008038, 0x00000000 },
+-    { 0x0000803c, 0x00000000 },
+-    { 0x00008048, 0x40000000 },
+-    { 0x00008054, 0x00000000 },
+-    { 0x00008058, 0x00000000 },
+-    { 0x0000805c, 0x000fc78f },
+-    { 0x00008060, 0x0000000f },
+-    { 0x00008064, 0x00000000 },
+-    { 0x000080c0, 0x2a82301a },
+-    { 0x000080c4, 0x05dc01e0 },
+-    { 0x000080c8, 0x1f402710 },
+-    { 0x000080cc, 0x01f40000 },
+-    { 0x000080d0, 0x00001e00 },
+-    { 0x000080d4, 0x00000000 },
+-    { 0x000080d8, 0x00400000 },
+-    { 0x000080e0, 0xffffffff },
+-    { 0x000080e4, 0x0000ffff },
+-    { 0x000080e8, 0x003f3f3f },
+-    { 0x000080ec, 0x00000000 },
+-    { 0x000080f0, 0x00000000 },
+-    { 0x000080f4, 0x00000000 },
+-    { 0x000080f8, 0x00000000 },
+-    { 0x000080fc, 0x00020000 },
+-    { 0x00008100, 0x00020000 },
+-    { 0x00008104, 0x00000001 },
+-    { 0x00008108, 0x00000052 },
+-    { 0x0000810c, 0x00000000 },
+-    { 0x00008110, 0x00000168 },
+-    { 0x00008118, 0x000100aa },
+-    { 0x0000811c, 0x00003210 },
+-    { 0x00008120, 0x08f04800 },
+-    { 0x00008124, 0x00000000 },
+-    { 0x00008128, 0x00000000 },
+-    { 0x0000812c, 0x00000000 },
+-    { 0x00008130, 0x00000000 },
+-    { 0x00008134, 0x00000000 },
+-    { 0x00008138, 0x00000000 },
+-    { 0x0000813c, 0x00000000 },
+-    { 0x00008144, 0xffffffff },
+-    { 0x00008168, 0x00000000 },
+-    { 0x0000816c, 0x00000000 },
+-    { 0x00008170, 0x32143320 },
+-    { 0x00008174, 0xfaa4fa50 },
+-    { 0x00008178, 0x00000100 },
+-    { 0x0000817c, 0x00000000 },
+-    { 0x000081c4, 0x00000000 },
+-    { 0x000081d0, 0x00003210 },
+-    { 0x000081ec, 0x00000000 },
+-    { 0x000081f0, 0x00000000 },
+-    { 0x000081f4, 0x00000000 },
+-    { 0x000081f8, 0x00000000 },
+-    { 0x000081fc, 0x00000000 },
+-    { 0x00008200, 0x00000000 },
+-    { 0x00008204, 0x00000000 },
+-    { 0x00008208, 0x00000000 },
+-    { 0x0000820c, 0x00000000 },
+-    { 0x00008210, 0x00000000 },
+-    { 0x00008214, 0x00000000 },
+-    { 0x00008218, 0x00000000 },
+-    { 0x0000821c, 0x00000000 },
+-    { 0x00008220, 0x00000000 },
+-    { 0x00008224, 0x00000000 },
+-    { 0x00008228, 0x00000000 },
+-    { 0x0000822c, 0x00000000 },
+-    { 0x00008230, 0x00000000 },
+-    { 0x00008234, 0x00000000 },
+-    { 0x00008238, 0x00000000 },
+-    { 0x0000823c, 0x00000000 },
+-    { 0x00008240, 0x00100000 },
+-    { 0x00008244, 0x0010f400 },
+-    { 0x00008248, 0x00000100 },
+-    { 0x0000824c, 0x0001e800 },
+-    { 0x00008250, 0x00000000 },
+-    { 0x00008254, 0x00000000 },
+-    { 0x00008258, 0x00000000 },
+-    { 0x0000825c, 0x400000ff },
+-    { 0x00008260, 0x00080922 },
+-    { 0x00008270, 0x00000000 },
+-    { 0x00008274, 0x40000000 },
+-    { 0x00008278, 0x003e4180 },
+-    { 0x0000827c, 0x00000000 },
+-    { 0x00008284, 0x0000002c },
+-    { 0x00008288, 0x0000002c },
+-    { 0x0000828c, 0x00000000 },
+-    { 0x00008294, 0x00000000 },
+-    { 0x00008298, 0x00000000 },
+-    { 0x00008300, 0x00000000 },
+-    { 0x00008304, 0x00000000 },
+-    { 0x00008308, 0x00000000 },
+-    { 0x0000830c, 0x00000000 },
+-    { 0x00008310, 0x00000000 },
+-    { 0x00008314, 0x00000000 },
+-    { 0x00008318, 0x00000000 },
+-    { 0x00008328, 0x00000000 },
+-    { 0x0000832c, 0x00000007 },
+-    { 0x00008330, 0x00000302 },
+-    { 0x00008334, 0x00000e00 },
+-    { 0x00008338, 0x00ff0000 },
+-    { 0x0000833c, 0x00000000 },
+-    { 0x00008340, 0x000107ff },
+-    { 0x00009808, 0x00000000 },
+-    { 0x0000980c, 0xad848e19 },
+-    { 0x00009810, 0x7d14e000 },
+-    { 0x00009814, 0x9c0a9f6b },
+-    { 0x0000981c, 0x00000000 },
+-    { 0x0000982c, 0x0000a000 },
+-    { 0x00009830, 0x00000000 },
+-    { 0x0000983c, 0x00200400 },
+-    { 0x00009840, 0x206a01ae },
+-    { 0x0000984c, 0x1284233c },
+-    { 0x00009854, 0x00000859 },
+-    { 0x00009900, 0x00000000 },
+-    { 0x00009904, 0x00000000 },
+-    { 0x00009908, 0x00000000 },
+-    { 0x0000990c, 0x00000000 },
+-    { 0x0000991c, 0x10000fff },
+-    { 0x00009920, 0x05100000 },
+-    { 0x0000a920, 0x05100000 },
+-    { 0x0000b920, 0x05100000 },
+-    { 0x00009928, 0x00000001 },
+-    { 0x0000992c, 0x00000004 },
+-    { 0x00009934, 0x1e1f2022 },
+-    { 0x00009938, 0x0a0b0c0d },
+-    { 0x0000993c, 0x00000000 },
+-    { 0x00009948, 0x9280b212 },
+-    { 0x0000994c, 0x00020028 },
+-    { 0x00009954, 0x5f3ca3de },
+-    { 0x00009958, 0x2108ecff },
+-    { 0x00009940, 0x00750604 },
+-    { 0x0000c95c, 0x004b6a8e },
+-    { 0x00009970, 0x190fb515 },
+-    { 0x00009974, 0x00000000 },
+-    { 0x00009978, 0x00000001 },
+-    { 0x0000997c, 0x00000000 },
+-    { 0x00009980, 0x00000000 },
+-    { 0x00009984, 0x00000000 },
+-    { 0x00009988, 0x00000000 },
+-    { 0x0000998c, 0x00000000 },
+-    { 0x00009990, 0x00000000 },
+-    { 0x00009994, 0x00000000 },
+-    { 0x00009998, 0x00000000 },
+-    { 0x0000999c, 0x00000000 },
+-    { 0x000099a0, 0x00000000 },
+-    { 0x000099a4, 0x00000001 },
+-    { 0x000099a8, 0x201fff00 },
+-    { 0x000099ac, 0x006f0000 },
+-    { 0x000099b0, 0x03051000 },
+-    { 0x000099dc, 0x00000000 },
+-    { 0x000099e0, 0x00000200 },
+-    { 0x000099e4, 0xaaaaaaaa },
+-    { 0x000099e8, 0x3c466478 },
+-    { 0x000099ec, 0x0cc80caa },
+-    { 0x000099fc, 0x00001042 },
+-    { 0x00009b00, 0x00000000 },
+-    { 0x00009b04, 0x00000001 },
+-    { 0x00009b08, 0x00000002 },
+-    { 0x00009b0c, 0x00000003 },
+-    { 0x00009b10, 0x00000004 },
+-    { 0x00009b14, 0x00000005 },
+-    { 0x00009b18, 0x00000008 },
+-    { 0x00009b1c, 0x00000009 },
+-    { 0x00009b20, 0x0000000a },
+-    { 0x00009b24, 0x0000000b },
+-    { 0x00009b28, 0x0000000c },
+-    { 0x00009b2c, 0x0000000d },
+-    { 0x00009b30, 0x00000010 },
+-    { 0x00009b34, 0x00000011 },
+-    { 0x00009b38, 0x00000012 },
+-    { 0x00009b3c, 0x00000013 },
+-    { 0x00009b40, 0x00000014 },
+-    { 0x00009b44, 0x00000015 },
+-    { 0x00009b48, 0x00000018 },
+-    { 0x00009b4c, 0x00000019 },
+-    { 0x00009b50, 0x0000001a },
+-    { 0x00009b54, 0x0000001b },
+-    { 0x00009b58, 0x0000001c },
+-    { 0x00009b5c, 0x0000001d },
+-    { 0x00009b60, 0x00000020 },
+-    { 0x00009b64, 0x00000021 },
+-    { 0x00009b68, 0x00000022 },
+-    { 0x00009b6c, 0x00000023 },
+-    { 0x00009b70, 0x00000024 },
+-    { 0x00009b74, 0x00000025 },
+-    { 0x00009b78, 0x00000028 },
+-    { 0x00009b7c, 0x00000029 },
+-    { 0x00009b80, 0x0000002a },
+-    { 0x00009b84, 0x0000002b },
+-    { 0x00009b88, 0x0000002c },
+-    { 0x00009b8c, 0x0000002d },
+-    { 0x00009b90, 0x00000030 },
+-    { 0x00009b94, 0x00000031 },
+-    { 0x00009b98, 0x00000032 },
+-    { 0x00009b9c, 0x00000033 },
+-    { 0x00009ba0, 0x00000034 },
+-    { 0x00009ba4, 0x00000035 },
+-    { 0x00009ba8, 0x00000035 },
+-    { 0x00009bac, 0x00000035 },
+-    { 0x00009bb0, 0x00000035 },
+-    { 0x00009bb4, 0x00000035 },
+-    { 0x00009bb8, 0x00000035 },
+-    { 0x00009bbc, 0x00000035 },
+-    { 0x00009bc0, 0x00000035 },
+-    { 0x00009bc4, 0x00000035 },
+-    { 0x00009bc8, 0x00000035 },
+-    { 0x00009bcc, 0x00000035 },
+-    { 0x00009bd0, 0x00000035 },
+-    { 0x00009bd4, 0x00000035 },
+-    { 0x00009bd8, 0x00000035 },
+-    { 0x00009bdc, 0x00000035 },
+-    { 0x00009be0, 0x00000035 },
+-    { 0x00009be4, 0x00000035 },
+-    { 0x00009be8, 0x00000035 },
+-    { 0x00009bec, 0x00000035 },
+-    { 0x00009bf0, 0x00000035 },
+-    { 0x00009bf4, 0x00000035 },
+-    { 0x00009bf8, 0x00000010 },
+-    { 0x00009bfc, 0x0000001a },
+-    { 0x0000a210, 0x40806333 },
+-    { 0x0000a214, 0x00106c10 },
+-    { 0x0000a218, 0x009c4060 },
+-    { 0x0000a220, 0x018830c6 },
+-    { 0x0000a224, 0x00000400 },
+-    { 0x0000a228, 0x001a0bb5 },
+-    { 0x0000a22c, 0x00000000 },
+-    { 0x0000a234, 0x20202020 },
+-    { 0x0000a238, 0x20202020 },
+-    { 0x0000a23c, 0x13c889af },
+-    { 0x0000a240, 0x38490a20 },
+-    { 0x0000a244, 0x00007bb6 },
+-    { 0x0000a248, 0x0fff3ffc },
+-    { 0x0000a24c, 0x00000001 },
+-    { 0x0000a250, 0x0000e000 },
+-    { 0x0000a254, 0x00000000 },
+-    { 0x0000a258, 0x0cc75380 },
+-    { 0x0000a25c, 0x0f0f0f01 },
+-    { 0x0000a260, 0xdfa91f01 },
+-    { 0x0000a268, 0x00000001 },
+-    { 0x0000a26c, 0x0ebae9c6 },
+-    { 0x0000b26c, 0x0ebae9c6 },
+-    { 0x0000c26c, 0x0ebae9c6 },
+-    { 0x0000d270, 0x00820820 },
+-    { 0x0000a278, 0x1ce739ce },
+-    { 0x0000a27c, 0x050701ce },
+-    { 0x0000a338, 0x00000000 },
+-    { 0x0000a33c, 0x00000000 },
+-    { 0x0000a340, 0x00000000 },
+-    { 0x0000a344, 0x00000000 },
+-    { 0x0000a348, 0x3fffffff },
+-    { 0x0000a34c, 0x3fffffff },
+-    { 0x0000a350, 0x3fffffff },
+-    { 0x0000a354, 0x0003ffff },
+-    { 0x0000a358, 0x79bfaa03 },
+-    { 0x0000d35c, 0x07ffffef },
+-    { 0x0000d360, 0x0fffffe7 },
+-    { 0x0000d364, 0x17ffffe5 },
+-    { 0x0000d368, 0x1fffffe4 },
+-    { 0x0000d36c, 0x37ffffe3 },
+-    { 0x0000d370, 0x3fffffe3 },
+-    { 0x0000d374, 0x57ffffe3 },
+-    { 0x0000d378, 0x5fffffe2 },
+-    { 0x0000d37c, 0x7fffffe2 },
+-    { 0x0000d380, 0x7f3c7bba },
+-    { 0x0000d384, 0xf3307ff0 },
+-    { 0x0000a388, 0x0c000000 },
+-    { 0x0000a38c, 0x20202020 },
+-    { 0x0000a390, 0x20202020 },
+-    { 0x0000a394, 0x1ce739ce },
+-    { 0x0000a398, 0x000001ce },
+-    { 0x0000a39c, 0x00000001 },
+-    { 0x0000a3a0, 0x00000000 },
+-    { 0x0000a3a4, 0x00000000 },
+-    { 0x0000a3a8, 0x00000000 },
+-    { 0x0000a3ac, 0x00000000 },
+-    { 0x0000a3b0, 0x00000000 },
+-    { 0x0000a3b4, 0x00000000 },
+-    { 0x0000a3b8, 0x00000000 },
+-    { 0x0000a3bc, 0x00000000 },
+-    { 0x0000a3c0, 0x00000000 },
+-    { 0x0000a3c4, 0x00000000 },
+-    { 0x0000a3c8, 0x00000246 },
+-    { 0x0000a3cc, 0x20202020 },
+-    { 0x0000a3d0, 0x20202020 },
+-    { 0x0000a3d4, 0x20202020 },
+-    { 0x0000a3dc, 0x1ce739ce },
+-    { 0x0000a3e0, 0x000001ce },
++      /* Addr      allmodes  */
++      {0x0000000c, 0x00000000},
++      {0x00000030, 0x00020015},
++      {0x00000034, 0x00000005},
++      {0x00000040, 0x00000000},
++      {0x00000044, 0x00000008},
++      {0x00000048, 0x00000008},
++      {0x0000004c, 0x00000010},
++      {0x00000050, 0x00000000},
++      {0x00000054, 0x0000001f},
++      {0x00000800, 0x00000000},
++      {0x00000804, 0x00000000},
++      {0x00000808, 0x00000000},
++      {0x0000080c, 0x00000000},
++      {0x00000810, 0x00000000},
++      {0x00000814, 0x00000000},
++      {0x00000818, 0x00000000},
++      {0x0000081c, 0x00000000},
++      {0x00000820, 0x00000000},
++      {0x00000824, 0x00000000},
++      {0x00001040, 0x002ffc0f},
++      {0x00001044, 0x002ffc0f},
++      {0x00001048, 0x002ffc0f},
++      {0x0000104c, 0x002ffc0f},
++      {0x00001050, 0x002ffc0f},
++      {0x00001054, 0x002ffc0f},
++      {0x00001058, 0x002ffc0f},
++      {0x0000105c, 0x002ffc0f},
++      {0x00001060, 0x002ffc0f},
++      {0x00001064, 0x002ffc0f},
++      {0x00001230, 0x00000000},
++      {0x00001270, 0x00000000},
++      {0x00001038, 0x00000000},
++      {0x00001078, 0x00000000},
++      {0x000010b8, 0x00000000},
++      {0x000010f8, 0x00000000},
++      {0x00001138, 0x00000000},
++      {0x00001178, 0x00000000},
++      {0x000011b8, 0x00000000},
++      {0x000011f8, 0x00000000},
++      {0x00001238, 0x00000000},
++      {0x00001278, 0x00000000},
++      {0x000012b8, 0x00000000},
++      {0x000012f8, 0x00000000},
++      {0x00001338, 0x00000000},
++      {0x00001378, 0x00000000},
++      {0x000013b8, 0x00000000},
++      {0x000013f8, 0x00000000},
++      {0x00001438, 0x00000000},
++      {0x00001478, 0x00000000},
++      {0x000014b8, 0x00000000},
++      {0x000014f8, 0x00000000},
++      {0x00001538, 0x00000000},
++      {0x00001578, 0x00000000},
++      {0x000015b8, 0x00000000},
++      {0x000015f8, 0x00000000},
++      {0x00001638, 0x00000000},
++      {0x00001678, 0x00000000},
++      {0x000016b8, 0x00000000},
++      {0x000016f8, 0x00000000},
++      {0x00001738, 0x00000000},
++      {0x00001778, 0x00000000},
++      {0x000017b8, 0x00000000},
++      {0x000017f8, 0x00000000},
++      {0x0000103c, 0x00000000},
++      {0x0000107c, 0x00000000},
++      {0x000010bc, 0x00000000},
++      {0x000010fc, 0x00000000},
++      {0x0000113c, 0x00000000},
++      {0x0000117c, 0x00000000},
++      {0x000011bc, 0x00000000},
++      {0x000011fc, 0x00000000},
++      {0x0000123c, 0x00000000},
++      {0x0000127c, 0x00000000},
++      {0x000012bc, 0x00000000},
++      {0x000012fc, 0x00000000},
++      {0x0000133c, 0x00000000},
++      {0x0000137c, 0x00000000},
++      {0x000013bc, 0x00000000},
++      {0x000013fc, 0x00000000},
++      {0x0000143c, 0x00000000},
++      {0x0000147c, 0x00000000},
++      {0x00004030, 0x00000002},
++      {0x0000403c, 0x00000002},
++      {0x00007010, 0x00000020},
++      {0x00007038, 0x000004c2},
++      {0x00008004, 0x00000000},
++      {0x00008008, 0x00000000},
++      {0x0000800c, 0x00000000},
++      {0x00008018, 0x00000700},
++      {0x00008020, 0x00000000},
++      {0x00008038, 0x00000000},
++      {0x0000803c, 0x00000000},
++      {0x00008048, 0x40000000},
++      {0x00008054, 0x00000000},
++      {0x00008058, 0x00000000},
++      {0x0000805c, 0x000fc78f},
++      {0x00008060, 0x0000000f},
++      {0x00008064, 0x00000000},
++      {0x000080c0, 0x2a82301a},
++      {0x000080c4, 0x05dc01e0},
++      {0x000080c8, 0x1f402710},
++      {0x000080cc, 0x01f40000},
++      {0x000080d0, 0x00001e00},
++      {0x000080d4, 0x00000000},
++      {0x000080d8, 0x00400000},
++      {0x000080e0, 0xffffffff},
++      {0x000080e4, 0x0000ffff},
++      {0x000080e8, 0x003f3f3f},
++      {0x000080ec, 0x00000000},
++      {0x000080f0, 0x00000000},
++      {0x000080f4, 0x00000000},
++      {0x000080f8, 0x00000000},
++      {0x000080fc, 0x00020000},
++      {0x00008100, 0x00020000},
++      {0x00008104, 0x00000001},
++      {0x00008108, 0x00000052},
++      {0x0000810c, 0x00000000},
++      {0x00008110, 0x00000168},
++      {0x00008118, 0x000100aa},
++      {0x0000811c, 0x00003210},
++      {0x00008120, 0x08f04800},
++      {0x00008124, 0x00000000},
++      {0x00008128, 0x00000000},
++      {0x0000812c, 0x00000000},
++      {0x00008130, 0x00000000},
++      {0x00008134, 0x00000000},
++      {0x00008138, 0x00000000},
++      {0x0000813c, 0x00000000},
++      {0x00008144, 0xffffffff},
++      {0x00008168, 0x00000000},
++      {0x0000816c, 0x00000000},
++      {0x00008170, 0x32143320},
++      {0x00008174, 0xfaa4fa50},
++      {0x00008178, 0x00000100},
++      {0x0000817c, 0x00000000},
++      {0x000081c4, 0x00000000},
++      {0x000081d0, 0x00003210},
++      {0x000081ec, 0x00000000},
++      {0x000081f0, 0x00000000},
++      {0x000081f4, 0x00000000},
++      {0x000081f8, 0x00000000},
++      {0x000081fc, 0x00000000},
++      {0x00008200, 0x00000000},
++      {0x00008204, 0x00000000},
++      {0x00008208, 0x00000000},
++      {0x0000820c, 0x00000000},
++      {0x00008210, 0x00000000},
++      {0x00008214, 0x00000000},
++      {0x00008218, 0x00000000},
++      {0x0000821c, 0x00000000},
++      {0x00008220, 0x00000000},
++      {0x00008224, 0x00000000},
++      {0x00008228, 0x00000000},
++      {0x0000822c, 0x00000000},
++      {0x00008230, 0x00000000},
++      {0x00008234, 0x00000000},
++      {0x00008238, 0x00000000},
++      {0x0000823c, 0x00000000},
++      {0x00008240, 0x00100000},
++      {0x00008244, 0x0010f400},
++      {0x00008248, 0x00000100},
++      {0x0000824c, 0x0001e800},
++      {0x00008250, 0x00000000},
++      {0x00008254, 0x00000000},
++      {0x00008258, 0x00000000},
++      {0x0000825c, 0x400000ff},
++      {0x00008260, 0x00080922},
++      {0x00008270, 0x00000000},
++      {0x00008274, 0x40000000},
++      {0x00008278, 0x003e4180},
++      {0x0000827c, 0x00000000},
++      {0x00008284, 0x0000002c},
++      {0x00008288, 0x0000002c},
++      {0x0000828c, 0x00000000},
++      {0x00008294, 0x00000000},
++      {0x00008298, 0x00000000},
++      {0x00008300, 0x00000000},
++      {0x00008304, 0x00000000},
++      {0x00008308, 0x00000000},
++      {0x0000830c, 0x00000000},
++      {0x00008310, 0x00000000},
++      {0x00008314, 0x00000000},
++      {0x00008318, 0x00000000},
++      {0x00008328, 0x00000000},
++      {0x0000832c, 0x00000007},
++      {0x00008330, 0x00000302},
++      {0x00008334, 0x00000e00},
++      {0x00008338, 0x00ff0000},
++      {0x0000833c, 0x00000000},
++      {0x00008340, 0x000107ff},
++      {0x00009808, 0x00000000},
++      {0x0000980c, 0xad848e19},
++      {0x00009810, 0x7d14e000},
++      {0x00009814, 0x9c0a9f6b},
++      {0x0000981c, 0x00000000},
++      {0x0000982c, 0x0000a000},
++      {0x00009830, 0x00000000},
++      {0x0000983c, 0x00200400},
++      {0x00009840, 0x206a01ae},
++      {0x0000984c, 0x1284233c},
++      {0x00009854, 0x00000859},
++      {0x00009900, 0x00000000},
++      {0x00009904, 0x00000000},
++      {0x00009908, 0x00000000},
++      {0x0000990c, 0x00000000},
++      {0x0000991c, 0x10000fff},
++      {0x00009920, 0x05100000},
++      {0x0000a920, 0x05100000},
++      {0x0000b920, 0x05100000},
++      {0x00009928, 0x00000001},
++      {0x0000992c, 0x00000004},
++      {0x00009934, 0x1e1f2022},
++      {0x00009938, 0x0a0b0c0d},
++      {0x0000993c, 0x00000000},
++      {0x00009948, 0x9280b212},
++      {0x0000994c, 0x00020028},
++      {0x00009954, 0x5f3ca3de},
++      {0x00009958, 0x2108ecff},
++      {0x00009940, 0x00750604},
++      {0x0000c95c, 0x004b6a8e},
++      {0x00009970, 0x190fb515},
++      {0x00009974, 0x00000000},
++      {0x00009978, 0x00000001},
++      {0x0000997c, 0x00000000},
++      {0x00009980, 0x00000000},
++      {0x00009984, 0x00000000},
++      {0x00009988, 0x00000000},
++      {0x0000998c, 0x00000000},
++      {0x00009990, 0x00000000},
++      {0x00009994, 0x00000000},
++      {0x00009998, 0x00000000},
++      {0x0000999c, 0x00000000},
++      {0x000099a0, 0x00000000},
++      {0x000099a4, 0x00000001},
++      {0x000099a8, 0x201fff00},
++      {0x000099ac, 0x006f0000},
++      {0x000099b0, 0x03051000},
++      {0x000099dc, 0x00000000},
++      {0x000099e0, 0x00000200},
++      {0x000099e4, 0xaaaaaaaa},
++      {0x000099e8, 0x3c466478},
++      {0x000099ec, 0x0cc80caa},
++      {0x000099fc, 0x00001042},
++      {0x00009b00, 0x00000000},
++      {0x00009b04, 0x00000001},
++      {0x00009b08, 0x00000002},
++      {0x00009b0c, 0x00000003},
++      {0x00009b10, 0x00000004},
++      {0x00009b14, 0x00000005},
++      {0x00009b18, 0x00000008},
++      {0x00009b1c, 0x00000009},
++      {0x00009b20, 0x0000000a},
++      {0x00009b24, 0x0000000b},
++      {0x00009b28, 0x0000000c},
++      {0x00009b2c, 0x0000000d},
++      {0x00009b30, 0x00000010},
++      {0x00009b34, 0x00000011},
++      {0x00009b38, 0x00000012},
++      {0x00009b3c, 0x00000013},
++      {0x00009b40, 0x00000014},
++      {0x00009b44, 0x00000015},
++      {0x00009b48, 0x00000018},
++      {0x00009b4c, 0x00000019},
++      {0x00009b50, 0x0000001a},
++      {0x00009b54, 0x0000001b},
++      {0x00009b58, 0x0000001c},
++      {0x00009b5c, 0x0000001d},
++      {0x00009b60, 0x00000020},
++      {0x00009b64, 0x00000021},
++      {0x00009b68, 0x00000022},
++      {0x00009b6c, 0x00000023},
++      {0x00009b70, 0x00000024},
++      {0x00009b74, 0x00000025},
++      {0x00009b78, 0x00000028},
++      {0x00009b7c, 0x00000029},
++      {0x00009b80, 0x0000002a},
++      {0x00009b84, 0x0000002b},
++      {0x00009b88, 0x0000002c},
++      {0x00009b8c, 0x0000002d},
++      {0x00009b90, 0x00000030},
++      {0x00009b94, 0x00000031},
++      {0x00009b98, 0x00000032},
++      {0x00009b9c, 0x00000033},
++      {0x00009ba0, 0x00000034},
++      {0x00009ba4, 0x00000035},
++      {0x00009ba8, 0x00000035},
++      {0x00009bac, 0x00000035},
++      {0x00009bb0, 0x00000035},
++      {0x00009bb4, 0x00000035},
++      {0x00009bb8, 0x00000035},
++      {0x00009bbc, 0x00000035},
++      {0x00009bc0, 0x00000035},
++      {0x00009bc4, 0x00000035},
++      {0x00009bc8, 0x00000035},
++      {0x00009bcc, 0x00000035},
++      {0x00009bd0, 0x00000035},
++      {0x00009bd4, 0x00000035},
++      {0x00009bd8, 0x00000035},
++      {0x00009bdc, 0x00000035},
++      {0x00009be0, 0x00000035},
++      {0x00009be4, 0x00000035},
++      {0x00009be8, 0x00000035},
++      {0x00009bec, 0x00000035},
++      {0x00009bf0, 0x00000035},
++      {0x00009bf4, 0x00000035},
++      {0x00009bf8, 0x00000010},
++      {0x00009bfc, 0x0000001a},
++      {0x0000a210, 0x40806333},
++      {0x0000a214, 0x00106c10},
++      {0x0000a218, 0x009c4060},
++      {0x0000a220, 0x018830c6},
++      {0x0000a224, 0x00000400},
++      {0x0000a228, 0x001a0bb5},
++      {0x0000a22c, 0x00000000},
++      {0x0000a234, 0x20202020},
++      {0x0000a238, 0x20202020},
++      {0x0000a23c, 0x13c889af},
++      {0x0000a240, 0x38490a20},
++      {0x0000a244, 0x00007bb6},
++      {0x0000a248, 0x0fff3ffc},
++      {0x0000a24c, 0x00000001},
++      {0x0000a250, 0x0000e000},
++      {0x0000a254, 0x00000000},
++      {0x0000a258, 0x0cc75380},
++      {0x0000a25c, 0x0f0f0f01},
++      {0x0000a260, 0xdfa91f01},
++      {0x0000a268, 0x00000001},
++      {0x0000a26c, 0x0ebae9c6},
++      {0x0000b26c, 0x0ebae9c6},
++      {0x0000c26c, 0x0ebae9c6},
++      {0x0000d270, 0x00820820},
++      {0x0000a278, 0x1ce739ce},
++      {0x0000a27c, 0x050701ce},
++      {0x0000a338, 0x00000000},
++      {0x0000a33c, 0x00000000},
++      {0x0000a340, 0x00000000},
++      {0x0000a344, 0x00000000},
++      {0x0000a348, 0x3fffffff},
++      {0x0000a34c, 0x3fffffff},
++      {0x0000a350, 0x3fffffff},
++      {0x0000a354, 0x0003ffff},
++      {0x0000a358, 0x79bfaa03},
++      {0x0000d35c, 0x07ffffef},
++      {0x0000d360, 0x0fffffe7},
++      {0x0000d364, 0x17ffffe5},
++      {0x0000d368, 0x1fffffe4},
++      {0x0000d36c, 0x37ffffe3},
++      {0x0000d370, 0x3fffffe3},
++      {0x0000d374, 0x57ffffe3},
++      {0x0000d378, 0x5fffffe2},
++      {0x0000d37c, 0x7fffffe2},
++      {0x0000d380, 0x7f3c7bba},
++      {0x0000d384, 0xf3307ff0},
++      {0x0000a388, 0x0c000000},
++      {0x0000a38c, 0x20202020},
++      {0x0000a390, 0x20202020},
++      {0x0000a394, 0x1ce739ce},
++      {0x0000a398, 0x000001ce},
++      {0x0000a39c, 0x00000001},
++      {0x0000a3a0, 0x00000000},
++      {0x0000a3a4, 0x00000000},
++      {0x0000a3a8, 0x00000000},
++      {0x0000a3ac, 0x00000000},
++      {0x0000a3b0, 0x00000000},
++      {0x0000a3b4, 0x00000000},
++      {0x0000a3b8, 0x00000000},
++      {0x0000a3bc, 0x00000000},
++      {0x0000a3c0, 0x00000000},
++      {0x0000a3c4, 0x00000000},
++      {0x0000a3c8, 0x00000246},
++      {0x0000a3cc, 0x20202020},
++      {0x0000a3d0, 0x20202020},
++      {0x0000a3d4, 0x20202020},
++      {0x0000a3dc, 0x1ce739ce},
++      {0x0000a3e0, 0x000001ce},
+ };
+ static const u32 ar5416Bank0_9160[][2] = {
+-    { 0x000098b0, 0x1e5795e5 },
+-    { 0x000098e0, 0x02008020 },
++      /* Addr      allmodes  */
++      {0x000098b0, 0x1e5795e5},
++      {0x000098e0, 0x02008020},
+ };
+ static const u32 ar5416BB_RfGain_9160[][3] = {
+-    { 0x00009a00, 0x00000000, 0x00000000 },
+-    { 0x00009a04, 0x00000040, 0x00000040 },
+-    { 0x00009a08, 0x00000080, 0x00000080 },
+-    { 0x00009a0c, 0x000001a1, 0x00000141 },
+-    { 0x00009a10, 0x000001e1, 0x00000181 },
+-    { 0x00009a14, 0x00000021, 0x000001c1 },
+-    { 0x00009a18, 0x00000061, 0x00000001 },
+-    { 0x00009a1c, 0x00000168, 0x00000041 },
+-    { 0x00009a20, 0x000001a8, 0x000001a8 },
+-    { 0x00009a24, 0x000001e8, 0x000001e8 },
+-    { 0x00009a28, 0x00000028, 0x00000028 },
+-    { 0x00009a2c, 0x00000068, 0x00000068 },
+-    { 0x00009a30, 0x00000189, 0x000000a8 },
+-    { 0x00009a34, 0x000001c9, 0x00000169 },
+-    { 0x00009a38, 0x00000009, 0x000001a9 },
+-    { 0x00009a3c, 0x00000049, 0x000001e9 },
+-    { 0x00009a40, 0x00000089, 0x00000029 },
+-    { 0x00009a44, 0x00000170, 0x00000069 },
+-    { 0x00009a48, 0x000001b0, 0x00000190 },
+-    { 0x00009a4c, 0x000001f0, 0x000001d0 },
+-    { 0x00009a50, 0x00000030, 0x00000010 },
+-    { 0x00009a54, 0x00000070, 0x00000050 },
+-    { 0x00009a58, 0x00000191, 0x00000090 },
+-    { 0x00009a5c, 0x000001d1, 0x00000151 },
+-    { 0x00009a60, 0x00000011, 0x00000191 },
+-    { 0x00009a64, 0x00000051, 0x000001d1 },
+-    { 0x00009a68, 0x00000091, 0x00000011 },
+-    { 0x00009a6c, 0x000001b8, 0x00000051 },
+-    { 0x00009a70, 0x000001f8, 0x00000198 },
+-    { 0x00009a74, 0x00000038, 0x000001d8 },
+-    { 0x00009a78, 0x00000078, 0x00000018 },
+-    { 0x00009a7c, 0x00000199, 0x00000058 },
+-    { 0x00009a80, 0x000001d9, 0x00000098 },
+-    { 0x00009a84, 0x00000019, 0x00000159 },
+-    { 0x00009a88, 0x00000059, 0x00000199 },
+-    { 0x00009a8c, 0x00000099, 0x000001d9 },
+-    { 0x00009a90, 0x000000d9, 0x00000019 },
+-    { 0x00009a94, 0x000000f9, 0x00000059 },
+-    { 0x00009a98, 0x000000f9, 0x00000099 },
+-    { 0x00009a9c, 0x000000f9, 0x000000d9 },
+-    { 0x00009aa0, 0x000000f9, 0x000000f9 },
+-    { 0x00009aa4, 0x000000f9, 0x000000f9 },
+-    { 0x00009aa8, 0x000000f9, 0x000000f9 },
+-    { 0x00009aac, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ab8, 0x000000f9, 0x000000f9 },
+-    { 0x00009abc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ac8, 0x000000f9, 0x000000f9 },
+-    { 0x00009acc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ad8, 0x000000f9, 0x000000f9 },
+-    { 0x00009adc, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae0, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae4, 0x000000f9, 0x000000f9 },
+-    { 0x00009ae8, 0x000000f9, 0x000000f9 },
+-    { 0x00009aec, 0x000000f9, 0x000000f9 },
+-    { 0x00009af0, 0x000000f9, 0x000000f9 },
+-    { 0x00009af4, 0x000000f9, 0x000000f9 },
+-    { 0x00009af8, 0x000000f9, 0x000000f9 },
+-    { 0x00009afc, 0x000000f9, 0x000000f9 },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x00009a00, 0x00000000, 0x00000000},
++      {0x00009a04, 0x00000040, 0x00000040},
++      {0x00009a08, 0x00000080, 0x00000080},
++      {0x00009a0c, 0x000001a1, 0x00000141},
++      {0x00009a10, 0x000001e1, 0x00000181},
++      {0x00009a14, 0x00000021, 0x000001c1},
++      {0x00009a18, 0x00000061, 0x00000001},
++      {0x00009a1c, 0x00000168, 0x00000041},
++      {0x00009a20, 0x000001a8, 0x000001a8},
++      {0x00009a24, 0x000001e8, 0x000001e8},
++      {0x00009a28, 0x00000028, 0x00000028},
++      {0x00009a2c, 0x00000068, 0x00000068},
++      {0x00009a30, 0x00000189, 0x000000a8},
++      {0x00009a34, 0x000001c9, 0x00000169},
++      {0x00009a38, 0x00000009, 0x000001a9},
++      {0x00009a3c, 0x00000049, 0x000001e9},
++      {0x00009a40, 0x00000089, 0x00000029},
++      {0x00009a44, 0x00000170, 0x00000069},
++      {0x00009a48, 0x000001b0, 0x00000190},
++      {0x00009a4c, 0x000001f0, 0x000001d0},
++      {0x00009a50, 0x00000030, 0x00000010},
++      {0x00009a54, 0x00000070, 0x00000050},
++      {0x00009a58, 0x00000191, 0x00000090},
++      {0x00009a5c, 0x000001d1, 0x00000151},
++      {0x00009a60, 0x00000011, 0x00000191},
++      {0x00009a64, 0x00000051, 0x000001d1},
++      {0x00009a68, 0x00000091, 0x00000011},
++      {0x00009a6c, 0x000001b8, 0x00000051},
++      {0x00009a70, 0x000001f8, 0x00000198},
++      {0x00009a74, 0x00000038, 0x000001d8},
++      {0x00009a78, 0x00000078, 0x00000018},
++      {0x00009a7c, 0x00000199, 0x00000058},
++      {0x00009a80, 0x000001d9, 0x00000098},
++      {0x00009a84, 0x00000019, 0x00000159},
++      {0x00009a88, 0x00000059, 0x00000199},
++      {0x00009a8c, 0x00000099, 0x000001d9},
++      {0x00009a90, 0x000000d9, 0x00000019},
++      {0x00009a94, 0x000000f9, 0x00000059},
++      {0x00009a98, 0x000000f9, 0x00000099},
++      {0x00009a9c, 0x000000f9, 0x000000d9},
++      {0x00009aa0, 0x000000f9, 0x000000f9},
++      {0x00009aa4, 0x000000f9, 0x000000f9},
++      {0x00009aa8, 0x000000f9, 0x000000f9},
++      {0x00009aac, 0x000000f9, 0x000000f9},
++      {0x00009ab0, 0x000000f9, 0x000000f9},
++      {0x00009ab4, 0x000000f9, 0x000000f9},
++      {0x00009ab8, 0x000000f9, 0x000000f9},
++      {0x00009abc, 0x000000f9, 0x000000f9},
++      {0x00009ac0, 0x000000f9, 0x000000f9},
++      {0x00009ac4, 0x000000f9, 0x000000f9},
++      {0x00009ac8, 0x000000f9, 0x000000f9},
++      {0x00009acc, 0x000000f9, 0x000000f9},
++      {0x00009ad0, 0x000000f9, 0x000000f9},
++      {0x00009ad4, 0x000000f9, 0x000000f9},
++      {0x00009ad8, 0x000000f9, 0x000000f9},
++      {0x00009adc, 0x000000f9, 0x000000f9},
++      {0x00009ae0, 0x000000f9, 0x000000f9},
++      {0x00009ae4, 0x000000f9, 0x000000f9},
++      {0x00009ae8, 0x000000f9, 0x000000f9},
++      {0x00009aec, 0x000000f9, 0x000000f9},
++      {0x00009af0, 0x000000f9, 0x000000f9},
++      {0x00009af4, 0x000000f9, 0x000000f9},
++      {0x00009af8, 0x000000f9, 0x000000f9},
++      {0x00009afc, 0x000000f9, 0x000000f9},
+ };
+ static const u32 ar5416Bank1_9160[][2] = {
+-    { 0x000098b0, 0x02108421 },
+-    { 0x000098ec, 0x00000008 },
++      /* Addr      allmodes  */
++      {0x000098b0, 0x02108421},
++      {0x000098ec, 0x00000008},
+ };
+ static const u32 ar5416Bank2_9160[][2] = {
+-    { 0x000098b0, 0x0e73ff17 },
+-    { 0x000098e0, 0x00000420 },
++      /* Addr      allmodes  */
++      {0x000098b0, 0x0e73ff17},
++      {0x000098e0, 0x00000420},
+ };
+ static const u32 ar5416Bank3_9160[][3] = {
+-    { 0x000098f0, 0x01400018, 0x01c00018 },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x000098f0, 0x01400018, 0x01c00018},
+ };
+ static const u32 ar5416Bank6_9160[][3] = {
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00e00000, 0x00e00000 },
+-    { 0x0000989c, 0x005e0000, 0x005e0000 },
+-    { 0x0000989c, 0x00120000, 0x00120000 },
+-    { 0x0000989c, 0x00620000, 0x00620000 },
+-    { 0x0000989c, 0x00020000, 0x00020000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
+-    { 0x0000989c, 0x005f0000, 0x005f0000 },
+-    { 0x0000989c, 0x00870000, 0x00870000 },
+-    { 0x0000989c, 0x00f90000, 0x00f90000 },
+-    { 0x0000989c, 0x007b0000, 0x007b0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00f50000, 0x00f50000 },
+-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
+-    { 0x0000989c, 0x00110000, 0x00110000 },
+-    { 0x0000989c, 0x006100a8, 0x006100a8 },
+-    { 0x0000989c, 0x004210a2, 0x004210a2 },
+-    { 0x0000989c, 0x0014008f, 0x0014008f },
+-    { 0x0000989c, 0x00c40003, 0x00c40003 },
+-    { 0x0000989c, 0x003000f2, 0x003000f2 },
+-    { 0x0000989c, 0x00440016, 0x00440016 },
+-    { 0x0000989c, 0x00410040, 0x00410040 },
+-    { 0x0000989c, 0x0001805e, 0x0001805e },
+-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
+-    { 0x0000989c, 0x000000f1, 0x000000f1 },
+-    { 0x0000989c, 0x00002081, 0x00002081 },
+-    { 0x0000989c, 0x000000d4, 0x000000d4 },
+-    { 0x000098d0, 0x0000000f, 0x0010000f },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00e00000, 0x00e00000},
++      {0x0000989c, 0x005e0000, 0x005e0000},
++      {0x0000989c, 0x00120000, 0x00120000},
++      {0x0000989c, 0x00620000, 0x00620000},
++      {0x0000989c, 0x00020000, 0x00020000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x40ff0000, 0x40ff0000},
++      {0x0000989c, 0x005f0000, 0x005f0000},
++      {0x0000989c, 0x00870000, 0x00870000},
++      {0x0000989c, 0x00f90000, 0x00f90000},
++      {0x0000989c, 0x007b0000, 0x007b0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00f50000, 0x00f50000},
++      {0x0000989c, 0x00dc0000, 0x00dc0000},
++      {0x0000989c, 0x00110000, 0x00110000},
++      {0x0000989c, 0x006100a8, 0x006100a8},
++      {0x0000989c, 0x004210a2, 0x004210a2},
++      {0x0000989c, 0x0014008f, 0x0014008f},
++      {0x0000989c, 0x00c40003, 0x00c40003},
++      {0x0000989c, 0x003000f2, 0x003000f2},
++      {0x0000989c, 0x00440016, 0x00440016},
++      {0x0000989c, 0x00410040, 0x00410040},
++      {0x0000989c, 0x0001805e, 0x0001805e},
++      {0x0000989c, 0x0000c0ab, 0x0000c0ab},
++      {0x0000989c, 0x000000f1, 0x000000f1},
++      {0x0000989c, 0x00002081, 0x00002081},
++      {0x0000989c, 0x000000d4, 0x000000d4},
++      {0x000098d0, 0x0000000f, 0x0010000f},
+ };
+ static const u32 ar5416Bank6TPC_9160[][3] = {
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00000000, 0x00000000 },
+-    { 0x0000989c, 0x00e00000, 0x00e00000 },
+-    { 0x0000989c, 0x005e0000, 0x005e0000 },
+-    { 0x0000989c, 0x00120000, 0x00120000 },
+-    { 0x0000989c, 0x00620000, 0x00620000 },
+-    { 0x0000989c, 0x00020000, 0x00020000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x40ff0000, 0x40ff0000 },
+-    { 0x0000989c, 0x005f0000, 0x005f0000 },
+-    { 0x0000989c, 0x00870000, 0x00870000 },
+-    { 0x0000989c, 0x00f90000, 0x00f90000 },
+-    { 0x0000989c, 0x007b0000, 0x007b0000 },
+-    { 0x0000989c, 0x00ff0000, 0x00ff0000 },
+-    { 0x0000989c, 0x00f50000, 0x00f50000 },
+-    { 0x0000989c, 0x00dc0000, 0x00dc0000 },
+-    { 0x0000989c, 0x00110000, 0x00110000 },
+-    { 0x0000989c, 0x006100a8, 0x006100a8 },
+-    { 0x0000989c, 0x00423022, 0x00423022 },
+-    { 0x0000989c, 0x2014008f, 0x2014008f },
+-    { 0x0000989c, 0x00c40002, 0x00c40002 },
+-    { 0x0000989c, 0x003000f2, 0x003000f2 },
+-    { 0x0000989c, 0x00440016, 0x00440016 },
+-    { 0x0000989c, 0x00410040, 0x00410040 },
+-    { 0x0000989c, 0x0001805e, 0x0001805e },
+-    { 0x0000989c, 0x0000c0ab, 0x0000c0ab },
+-    { 0x0000989c, 0x000000e1, 0x000000e1 },
+-    { 0x0000989c, 0x00007080, 0x00007080 },
+-    { 0x0000989c, 0x000000d4, 0x000000d4 },
+-    { 0x000098d0, 0x0000000f, 0x0010000f },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00000000, 0x00000000},
++      {0x0000989c, 0x00e00000, 0x00e00000},
++      {0x0000989c, 0x005e0000, 0x005e0000},
++      {0x0000989c, 0x00120000, 0x00120000},
++      {0x0000989c, 0x00620000, 0x00620000},
++      {0x0000989c, 0x00020000, 0x00020000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x40ff0000, 0x40ff0000},
++      {0x0000989c, 0x005f0000, 0x005f0000},
++      {0x0000989c, 0x00870000, 0x00870000},
++      {0x0000989c, 0x00f90000, 0x00f90000},
++      {0x0000989c, 0x007b0000, 0x007b0000},
++      {0x0000989c, 0x00ff0000, 0x00ff0000},
++      {0x0000989c, 0x00f50000, 0x00f50000},
++      {0x0000989c, 0x00dc0000, 0x00dc0000},
++      {0x0000989c, 0x00110000, 0x00110000},
++      {0x0000989c, 0x006100a8, 0x006100a8},
++      {0x0000989c, 0x00423022, 0x00423022},
++      {0x0000989c, 0x2014008f, 0x2014008f},
++      {0x0000989c, 0x00c40002, 0x00c40002},
++      {0x0000989c, 0x003000f2, 0x003000f2},
++      {0x0000989c, 0x00440016, 0x00440016},
++      {0x0000989c, 0x00410040, 0x00410040},
++      {0x0000989c, 0x0001805e, 0x0001805e},
++      {0x0000989c, 0x0000c0ab, 0x0000c0ab},
++      {0x0000989c, 0x000000e1, 0x000000e1},
++      {0x0000989c, 0x00007080, 0x00007080},
++      {0x0000989c, 0x000000d4, 0x000000d4},
++      {0x000098d0, 0x0000000f, 0x0010000f},
+ };
+ static const u32 ar5416Bank7_9160[][2] = {
+-    { 0x0000989c, 0x00000500 },
+-    { 0x0000989c, 0x00000800 },
+-    { 0x000098cc, 0x0000000e },
++      /* Addr      allmodes  */
++      {0x0000989c, 0x00000500},
++      {0x0000989c, 0x00000800},
++      {0x000098cc, 0x0000000e},
+ };
+ static const u32 ar5416Addac_9160[][2] = {
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x000000c0 },
+-    {0x0000989c,  0x00000018 },
+-    {0x0000989c,  0x00000004 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x000000c0 },
+-    {0x0000989c,  0x00000019 },
+-    {0x0000989c,  0x00000004 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000004 },
+-    {0x0000989c,  0x00000003 },
+-    {0x0000989c,  0x00000008 },
+-    {0x0000989c,  0x00000000 },
+-    {0x000098cc,  0x00000000 },
++      /* Addr      allmodes  */
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x000000c0},
++      {0x0000989c, 0x00000018},
++      {0x0000989c, 0x00000004},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x000000c0},
++      {0x0000989c, 0x00000019},
++      {0x0000989c, 0x00000004},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000004},
++      {0x0000989c, 0x00000003},
++      {0x0000989c, 0x00000008},
++      {0x0000989c, 0x00000000},
++      {0x000098cc, 0x00000000},
+ };
+ static const u32 ar5416Addac_9160_1_1[][2] = {
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x000000c0 },
+-    {0x0000989c,  0x00000018 },
+-    {0x0000989c,  0x00000004 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x000000c0 },
+-    {0x0000989c,  0x00000019 },
+-    {0x0000989c,  0x00000004 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x0000989c,  0x00000000 },
+-    {0x000098cc,  0x00000000 },
++      /* Addr      allmodes  */
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x000000c0},
++      {0x0000989c, 0x00000018},
++      {0x0000989c, 0x00000004},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x000000c0},
++      {0x0000989c, 0x00000019},
++      {0x0000989c, 0x00000004},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x0000989c, 0x00000000},
++      {0x000098cc, 0x00000000},
+ };
+--- a/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9002_initvals.h
+@@ -14,5217 +14,5212 @@
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+-#ifndef INITVALS_9002_10_H
+-#define INITVALS_9002_10_H
+-
+ static const u32 ar9280Modes_9280[][6] = {
+-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
+-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
+-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
+-    { 0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008 },
+-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801080, 0x08400840, 0x06e006e0 },
+-    { 0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f },
+-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
+-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
+-    { 0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
+-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
+-    { 0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0 },
+-    { 0x00009848, 0x00028566, 0x00028566, 0x00028563, 0x00028563, 0x00028563 },
+-    { 0x0000a848, 0x00028566, 0x00028566, 0x00028563, 0x00028563, 0x00028563 },
+-    { 0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2 },
+-    { 0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e },
+-    { 0x0000985c, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e },
+-    { 0x00009860, 0x00049d18, 0x00049d18, 0x00049d20, 0x00049d20, 0x00049d18 },
+-    { 0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
+-    { 0x00009868, 0x5ac64190, 0x5ac64190, 0x5ac64190, 0x5ac64190, 0x5ac64190 },
+-    { 0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881 },
+-    { 0x00009914, 0x000007d0, 0x000007d0, 0x00000898, 0x00000898, 0x000007d0 },
+-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016 },
+-    { 0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
+-    { 0x00009944, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010 },
+-    { 0x00009960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
+-    { 0x0000a960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
+-    { 0x00009964, 0x00000210, 0x00000210, 0x00000210, 0x00000210, 0x00000210 },
+-    { 0x0000c9b8, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a },
+-    { 0x0000c9bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00 },
+-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
+-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
+-    { 0x000099c8, 0x60f6532c, 0x60f6532c, 0x60f6532c, 0x60f6532c, 0x60f6532c },
+-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
+-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
+-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x00009a00, 0x00008184, 0x00008184, 0x00000214, 0x00000214, 0x00000214 },
+-    { 0x00009a04, 0x00008188, 0x00008188, 0x00000218, 0x00000218, 0x00000218 },
+-    { 0x00009a08, 0x0000818c, 0x0000818c, 0x00000224, 0x00000224, 0x00000224 },
+-    { 0x00009a0c, 0x00008190, 0x00008190, 0x00000228, 0x00000228, 0x00000228 },
+-    { 0x00009a10, 0x00008194, 0x00008194, 0x0000022c, 0x0000022c, 0x0000022c },
+-    { 0x00009a14, 0x00008200, 0x00008200, 0x00000230, 0x00000230, 0x00000230 },
+-    { 0x00009a18, 0x00008204, 0x00008204, 0x000002a4, 0x000002a4, 0x000002a4 },
+-    { 0x00009a1c, 0x00008208, 0x00008208, 0x000002a8, 0x000002a8, 0x000002a8 },
+-    { 0x00009a20, 0x0000820c, 0x0000820c, 0x000002ac, 0x000002ac, 0x000002ac },
+-    { 0x00009a24, 0x00008210, 0x00008210, 0x000002b0, 0x000002b0, 0x000002b0 },
+-    { 0x00009a28, 0x00008214, 0x00008214, 0x000002b4, 0x000002b4, 0x000002b4 },
+-    { 0x00009a2c, 0x00008280, 0x00008280, 0x000002b8, 0x000002b8, 0x000002b8 },
+-    { 0x00009a30, 0x00008284, 0x00008284, 0x00000390, 0x00000390, 0x00000390 },
+-    { 0x00009a34, 0x00008288, 0x00008288, 0x00000394, 0x00000394, 0x00000394 },
+-    { 0x00009a38, 0x0000828c, 0x0000828c, 0x00000398, 0x00000398, 0x00000398 },
+-    { 0x00009a3c, 0x00008290, 0x00008290, 0x00000334, 0x00000334, 0x00000334 },
+-    { 0x00009a40, 0x00008300, 0x00008300, 0x00000338, 0x00000338, 0x00000338 },
+-    { 0x00009a44, 0x00008304, 0x00008304, 0x000003ac, 0x000003ac, 0x000003ac },
+-    { 0x00009a48, 0x00008308, 0x00008308, 0x000003b0, 0x000003b0, 0x000003b0 },
+-    { 0x00009a4c, 0x0000830c, 0x0000830c, 0x000003b4, 0x000003b4, 0x000003b4 },
+-    { 0x00009a50, 0x00008310, 0x00008310, 0x000003b8, 0x000003b8, 0x000003b8 },
+-    { 0x00009a54, 0x00008314, 0x00008314, 0x000003a5, 0x000003a5, 0x000003a5 },
+-    { 0x00009a58, 0x00008380, 0x00008380, 0x000003a9, 0x000003a9, 0x000003a9 },
+-    { 0x00009a5c, 0x00008384, 0x00008384, 0x000003ad, 0x000003ad, 0x000003ad },
+-    { 0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194 },
+-    { 0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0 },
+-    { 0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c },
+-    { 0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8 },
+-    { 0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284 },
+-    { 0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288 },
+-    { 0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224 },
+-    { 0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290 },
+-    { 0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300 },
+-    { 0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304 },
+-    { 0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308 },
+-    { 0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c },
+-    { 0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380 },
+-    { 0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384 },
+-    { 0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700 },
+-    { 0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704 },
+-    { 0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708 },
+-    { 0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c },
+-    { 0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780 },
+-    { 0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784 },
+-    { 0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00 },
+-    { 0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04 },
+-    { 0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08 },
+-    { 0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c },
+-    { 0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b80, 0x00008b80, 0x00008b80 },
+-    { 0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b84, 0x00008b84, 0x00008b84 },
+-    { 0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b88, 0x00008b88, 0x00008b88 },
+-    { 0x00009acc, 0x0000b380, 0x0000b380, 0x00008b8c, 0x00008b8c, 0x00008b8c },
+-    { 0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b90, 0x00008b90, 0x00008b90 },
+-    { 0x00009ad4, 0x0000b388, 0x0000b388, 0x00008f80, 0x00008f80, 0x00008f80 },
+-    { 0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008f84, 0x00008f84, 0x00008f84 },
+-    { 0x00009adc, 0x0000b390, 0x0000b390, 0x00008f88, 0x00008f88, 0x00008f88 },
+-    { 0x00009ae0, 0x0000b394, 0x0000b394, 0x00008f8c, 0x00008f8c, 0x00008f8c },
+-    { 0x00009ae4, 0x0000b398, 0x0000b398, 0x00008f90, 0x00008f90, 0x00008f90 },
+-    { 0x00009ae8, 0x0000b780, 0x0000b780, 0x0000930c, 0x0000930c, 0x0000930c },
+-    { 0x00009aec, 0x0000b784, 0x0000b784, 0x00009310, 0x00009310, 0x00009310 },
+-    { 0x00009af0, 0x0000b788, 0x0000b788, 0x00009384, 0x00009384, 0x00009384 },
+-    { 0x00009af4, 0x0000b78c, 0x0000b78c, 0x00009388, 0x00009388, 0x00009388 },
+-    { 0x00009af8, 0x0000b790, 0x0000b790, 0x00009324, 0x00009324, 0x00009324 },
+-    { 0x00009afc, 0x0000b794, 0x0000b794, 0x00009704, 0x00009704, 0x00009704 },
+-    { 0x00009b00, 0x0000b798, 0x0000b798, 0x000096a4, 0x000096a4, 0x000096a4 },
+-    { 0x00009b04, 0x0000d784, 0x0000d784, 0x000096a8, 0x000096a8, 0x000096a8 },
+-    { 0x00009b08, 0x0000d788, 0x0000d788, 0x00009710, 0x00009710, 0x00009710 },
+-    { 0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00009714, 0x00009714, 0x00009714 },
+-    { 0x00009b10, 0x0000d790, 0x0000d790, 0x00009720, 0x00009720, 0x00009720 },
+-    { 0x00009b14, 0x0000f780, 0x0000f780, 0x00009724, 0x00009724, 0x00009724 },
+-    { 0x00009b18, 0x0000f784, 0x0000f784, 0x00009728, 0x00009728, 0x00009728 },
+-    { 0x00009b1c, 0x0000f788, 0x0000f788, 0x0000972c, 0x0000972c, 0x0000972c },
+-    { 0x00009b20, 0x0000f78c, 0x0000f78c, 0x000097a0, 0x000097a0, 0x000097a0 },
+-    { 0x00009b24, 0x0000f790, 0x0000f790, 0x000097a4, 0x000097a4, 0x000097a4 },
+-    { 0x00009b28, 0x0000f794, 0x0000f794, 0x000097a8, 0x000097a8, 0x000097a8 },
+-    { 0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x000097b0, 0x000097b0, 0x000097b0 },
+-    { 0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x000097b4, 0x000097b4, 0x000097b4 },
+-    { 0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x000097b8, 0x000097b8, 0x000097b8 },
+-    { 0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x000097a5, 0x000097a5, 0x000097a5 },
+-    { 0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x000097a9, 0x000097a9, 0x000097a9 },
+-    { 0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x000097ad, 0x000097ad, 0x000097ad },
+-    { 0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x000097b1, 0x000097b1, 0x000097b1 },
+-    { 0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x000097b5, 0x000097b5, 0x000097b5 },
+-    { 0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x000097b9, 0x000097b9, 0x000097b9 },
+-    { 0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x000097c5, 0x000097c5, 0x000097c5 },
+-    { 0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x000097c9, 0x000097c9, 0x000097c9 },
+-    { 0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x000097d1, 0x000097d1, 0x000097d1 },
+-    { 0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x000097d5, 0x000097d5, 0x000097d5 },
+-    { 0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x000097d9, 0x000097d9, 0x000097d9 },
+-    { 0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x000097c6, 0x000097c6, 0x000097c6 },
+-    { 0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x000097ca, 0x000097ca, 0x000097ca },
+-    { 0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x000097ce, 0x000097ce, 0x000097ce },
+-    { 0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x000097d2, 0x000097d2, 0x000097d2 },
+-    { 0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x000097d6, 0x000097d6, 0x000097d6 },
+-    { 0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x000097c3, 0x000097c3, 0x000097c3 },
+-    { 0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x000097c7, 0x000097c7, 0x000097c7 },
+-    { 0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x000097cb, 0x000097cb, 0x000097cb },
+-    { 0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x000097cf, 0x000097cf, 0x000097cf },
+-    { 0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x000097d7, 0x000097d7, 0x000097d7 },
+-    { 0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009b98, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009b9c, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009ba0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009ba4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009ba8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bac, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bb0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bb4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bb8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bbc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bc0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bc4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bc8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bcc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bd0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bd4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bd8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bdc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009be0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009be4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009be8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bec, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bf0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bf4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bf8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x00009bfc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db },
+-    { 0x0000a204, 0x00000444, 0x00000444, 0x00000444, 0x00000444, 0x00000444 },
+-    { 0x0000a208, 0x803e4788, 0x803e4788, 0x803e4788, 0x803e4788, 0x803e4788 },
+-    { 0x0000a20c, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019 },
+-    { 0x0000b20c, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019 },
+-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
+-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
+-    { 0x0000a274, 0x0a19c652, 0x0a19c652, 0x0a1aa652, 0x0a1aa652, 0x0a1aa652 },
+-    { 0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a304, 0x00003002, 0x00003002, 0x00003002, 0x00003002, 0x00003002 },
+-    { 0x0000a308, 0x00006004, 0x00006004, 0x00008009, 0x00008009, 0x00008009 },
+-    { 0x0000a30c, 0x0000a006, 0x0000a006, 0x0000b00b, 0x0000b00b, 0x0000b00b },
+-    { 0x0000a310, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012 },
+-    { 0x0000a314, 0x00011014, 0x00011014, 0x00012048, 0x00012048, 0x00012048 },
+-    { 0x0000a318, 0x0001504a, 0x0001504a, 0x0001604a, 0x0001604a, 0x0001604a },
+-    { 0x0000a31c, 0x0001904c, 0x0001904c, 0x0001a211, 0x0001a211, 0x0001a211 },
+-    { 0x0000a320, 0x0001c04e, 0x0001c04e, 0x0001e213, 0x0001e213, 0x0001e213 },
+-    { 0x0000a324, 0x00020092, 0x00020092, 0x0002121b, 0x0002121b, 0x0002121b },
+-    { 0x0000a328, 0x0002410a, 0x0002410a, 0x00024412, 0x00024412, 0x00024412 },
+-    { 0x0000a32c, 0x0002710c, 0x0002710c, 0x00028414, 0x00028414, 0x00028414 },
+-    { 0x0000a330, 0x0002b18b, 0x0002b18b, 0x0002b44a, 0x0002b44a, 0x0002b44a },
+-    { 0x0000a334, 0x0002e1cc, 0x0002e1cc, 0x00030649, 0x00030649, 0x00030649 },
+-    { 0x0000a338, 0x000321ec, 0x000321ec, 0x0003364b, 0x0003364b, 0x0003364b },
+-    { 0x0000a33c, 0x000321ec, 0x000321ec, 0x00038a49, 0x00038a49, 0x00038a49 },
+-    { 0x0000a340, 0x000321ec, 0x000321ec, 0x0003be48, 0x0003be48, 0x0003be48 },
+-    { 0x0000a344, 0x000321ec, 0x000321ec, 0x0003ee4a, 0x0003ee4a, 0x0003ee4a },
+-    { 0x0000a348, 0x000321ec, 0x000321ec, 0x00042e88, 0x00042e88, 0x00042e88 },
+-    { 0x0000a34c, 0x000321ec, 0x000321ec, 0x00046e8a, 0x00046e8a, 0x00046e8a },
+-    { 0x0000a350, 0x000321ec, 0x000321ec, 0x00049ec9, 0x00049ec9, 0x00049ec9 },
+-    { 0x0000a354, 0x000321ec, 0x000321ec, 0x0004bf42, 0x0004bf42, 0x0004bf42 },
+-    { 0x0000784c, 0x0e4f048c, 0x0e4f048c, 0x0e4d048c, 0x0e4d048c, 0x0e4d048c },
+-    { 0x00007854, 0x12031828, 0x12031828, 0x12035828, 0x12035828, 0x12035828 },
+-    { 0x00007870, 0x807ec400, 0x807ec400, 0x807ec000, 0x807ec000, 0x807ec000 },
+-    { 0x0000788c, 0x00010000, 0x00010000, 0x00110000, 0x00110000, 0x00110000 },
++      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
++      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
++      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
++      {0x000010f0, 0x0000a000, 0x00014000, 0x00016000, 0x0000b000, 0x00014008},
++      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801080, 0x08400840, 0x06e006e0},
++      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f},
++      {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
++      {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
++      {0x00009824, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
++      {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
++      {0x00009844, 0x1372161e, 0x1372161e, 0x137216a0, 0x137216a0, 0x137216a0},
++      {0x00009848, 0x00028566, 0x00028566, 0x00028563, 0x00028563, 0x00028563},
++      {0x0000a848, 0x00028566, 0x00028566, 0x00028563, 0x00028563, 0x00028563},
++      {0x00009850, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2, 0x6d4000e2},
++      {0x00009858, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e, 0x7ec82d2e},
++      {0x0000985c, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e},
++      {0x00009860, 0x00049d18, 0x00049d18, 0x00049d20, 0x00049d20, 0x00049d18},
++      {0x0000c864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
++      {0x00009868, 0x5ac64190, 0x5ac64190, 0x5ac64190, 0x5ac64190, 0x5ac64190},
++      {0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881},
++      {0x00009914, 0x000007d0, 0x000007d0, 0x00000898, 0x00000898, 0x000007d0},
++      {0x00009918, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b, 0x00000016},
++      {0x00009924, 0xd00a8a07, 0xd00a8a07, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d},
++      {0x00009944, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010, 0xdfbc1010},
++      {0x00009960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010},
++      {0x0000a960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010},
++      {0x00009964, 0x00000210, 0x00000210, 0x00000210, 0x00000210, 0x00000210},
++      {0x0000c9b8, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
++      {0x0000c9bc, 0x00000600, 0x00000600, 0x00000c00, 0x00000c00, 0x00000c00},
++      {0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
++      {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
++      {0x000099c8, 0x60f6532c, 0x60f6532c, 0x60f6532c, 0x60f6532c, 0x60f6532c},
++      {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
++      {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
++      {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x00009a00, 0x00008184, 0x00008184, 0x00000214, 0x00000214, 0x00000214},
++      {0x00009a04, 0x00008188, 0x00008188, 0x00000218, 0x00000218, 0x00000218},
++      {0x00009a08, 0x0000818c, 0x0000818c, 0x00000224, 0x00000224, 0x00000224},
++      {0x00009a0c, 0x00008190, 0x00008190, 0x00000228, 0x00000228, 0x00000228},
++      {0x00009a10, 0x00008194, 0x00008194, 0x0000022c, 0x0000022c, 0x0000022c},
++      {0x00009a14, 0x00008200, 0x00008200, 0x00000230, 0x00000230, 0x00000230},
++      {0x00009a18, 0x00008204, 0x00008204, 0x000002a4, 0x000002a4, 0x000002a4},
++      {0x00009a1c, 0x00008208, 0x00008208, 0x000002a8, 0x000002a8, 0x000002a8},
++      {0x00009a20, 0x0000820c, 0x0000820c, 0x000002ac, 0x000002ac, 0x000002ac},
++      {0x00009a24, 0x00008210, 0x00008210, 0x000002b0, 0x000002b0, 0x000002b0},
++      {0x00009a28, 0x00008214, 0x00008214, 0x000002b4, 0x000002b4, 0x000002b4},
++      {0x00009a2c, 0x00008280, 0x00008280, 0x000002b8, 0x000002b8, 0x000002b8},
++      {0x00009a30, 0x00008284, 0x00008284, 0x00000390, 0x00000390, 0x00000390},
++      {0x00009a34, 0x00008288, 0x00008288, 0x00000394, 0x00000394, 0x00000394},
++      {0x00009a38, 0x0000828c, 0x0000828c, 0x00000398, 0x00000398, 0x00000398},
++      {0x00009a3c, 0x00008290, 0x00008290, 0x00000334, 0x00000334, 0x00000334},
++      {0x00009a40, 0x00008300, 0x00008300, 0x00000338, 0x00000338, 0x00000338},
++      {0x00009a44, 0x00008304, 0x00008304, 0x000003ac, 0x000003ac, 0x000003ac},
++      {0x00009a48, 0x00008308, 0x00008308, 0x000003b0, 0x000003b0, 0x000003b0},
++      {0x00009a4c, 0x0000830c, 0x0000830c, 0x000003b4, 0x000003b4, 0x000003b4},
++      {0x00009a50, 0x00008310, 0x00008310, 0x000003b8, 0x000003b8, 0x000003b8},
++      {0x00009a54, 0x00008314, 0x00008314, 0x000003a5, 0x000003a5, 0x000003a5},
++      {0x00009a58, 0x00008380, 0x00008380, 0x000003a9, 0x000003a9, 0x000003a9},
++      {0x00009a5c, 0x00008384, 0x00008384, 0x000003ad, 0x000003ad, 0x000003ad},
++      {0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194},
++      {0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0},
++      {0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c},
++      {0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8},
++      {0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284},
++      {0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288},
++      {0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224},
++      {0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290},
++      {0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300},
++      {0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304},
++      {0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308},
++      {0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c},
++      {0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380},
++      {0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384},
++      {0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700},
++      {0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704},
++      {0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708},
++      {0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c},
++      {0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780},
++      {0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784},
++      {0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00},
++      {0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04},
++      {0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08},
++      {0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c},
++      {0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b80, 0x00008b80, 0x00008b80},
++      {0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b84, 0x00008b84, 0x00008b84},
++      {0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b88, 0x00008b88, 0x00008b88},
++      {0x00009acc, 0x0000b380, 0x0000b380, 0x00008b8c, 0x00008b8c, 0x00008b8c},
++      {0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b90, 0x00008b90, 0x00008b90},
++      {0x00009ad4, 0x0000b388, 0x0000b388, 0x00008f80, 0x00008f80, 0x00008f80},
++      {0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008f84, 0x00008f84, 0x00008f84},
++      {0x00009adc, 0x0000b390, 0x0000b390, 0x00008f88, 0x00008f88, 0x00008f88},
++      {0x00009ae0, 0x0000b394, 0x0000b394, 0x00008f8c, 0x00008f8c, 0x00008f8c},
++      {0x00009ae4, 0x0000b398, 0x0000b398, 0x00008f90, 0x00008f90, 0x00008f90},
++      {0x00009ae8, 0x0000b780, 0x0000b780, 0x0000930c, 0x0000930c, 0x0000930c},
++      {0x00009aec, 0x0000b784, 0x0000b784, 0x00009310, 0x00009310, 0x00009310},
++      {0x00009af0, 0x0000b788, 0x0000b788, 0x00009384, 0x00009384, 0x00009384},
++      {0x00009af4, 0x0000b78c, 0x0000b78c, 0x00009388, 0x00009388, 0x00009388},
++      {0x00009af8, 0x0000b790, 0x0000b790, 0x00009324, 0x00009324, 0x00009324},
++      {0x00009afc, 0x0000b794, 0x0000b794, 0x00009704, 0x00009704, 0x00009704},
++      {0x00009b00, 0x0000b798, 0x0000b798, 0x000096a4, 0x000096a4, 0x000096a4},
++      {0x00009b04, 0x0000d784, 0x0000d784, 0x000096a8, 0x000096a8, 0x000096a8},
++      {0x00009b08, 0x0000d788, 0x0000d788, 0x00009710, 0x00009710, 0x00009710},
++      {0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00009714, 0x00009714, 0x00009714},
++      {0x00009b10, 0x0000d790, 0x0000d790, 0x00009720, 0x00009720, 0x00009720},
++      {0x00009b14, 0x0000f780, 0x0000f780, 0x00009724, 0x00009724, 0x00009724},
++      {0x00009b18, 0x0000f784, 0x0000f784, 0x00009728, 0x00009728, 0x00009728},
++      {0x00009b1c, 0x0000f788, 0x0000f788, 0x0000972c, 0x0000972c, 0x0000972c},
++      {0x00009b20, 0x0000f78c, 0x0000f78c, 0x000097a0, 0x000097a0, 0x000097a0},
++      {0x00009b24, 0x0000f790, 0x0000f790, 0x000097a4, 0x000097a4, 0x000097a4},
++      {0x00009b28, 0x0000f794, 0x0000f794, 0x000097a8, 0x000097a8, 0x000097a8},
++      {0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x000097b0, 0x000097b0, 0x000097b0},
++      {0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x000097b4, 0x000097b4, 0x000097b4},
++      {0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x000097b8, 0x000097b8, 0x000097b8},
++      {0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x000097a5, 0x000097a5, 0x000097a5},
++      {0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x000097a9, 0x000097a9, 0x000097a9},
++      {0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x000097ad, 0x000097ad, 0x000097ad},
++      {0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x000097b1, 0x000097b1, 0x000097b1},
++      {0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x000097b5, 0x000097b5, 0x000097b5},
++      {0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x000097b9, 0x000097b9, 0x000097b9},
++      {0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x000097c5, 0x000097c5, 0x000097c5},
++      {0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x000097c9, 0x000097c9, 0x000097c9},
++      {0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x000097d1, 0x000097d1, 0x000097d1},
++      {0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x000097d5, 0x000097d5, 0x000097d5},
++      {0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x000097d9, 0x000097d9, 0x000097d9},
++      {0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x000097c6, 0x000097c6, 0x000097c6},
++      {0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x000097ca, 0x000097ca, 0x000097ca},
++      {0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x000097ce, 0x000097ce, 0x000097ce},
++      {0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x000097d2, 0x000097d2, 0x000097d2},
++      {0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x000097d6, 0x000097d6, 0x000097d6},
++      {0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x000097c3, 0x000097c3, 0x000097c3},
++      {0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x000097c7, 0x000097c7, 0x000097c7},
++      {0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x000097cb, 0x000097cb, 0x000097cb},
++      {0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x000097cf, 0x000097cf, 0x000097cf},
++      {0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x000097d7, 0x000097d7, 0x000097d7},
++      {0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009b98, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009b9c, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009ba0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009ba4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009ba8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bac, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bb0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bb4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bb8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bbc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bc0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bc4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bc8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bcc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bd0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bd4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bd8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bdc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009be0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009be4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009be8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bec, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bf0, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bf4, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bf8, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x00009bfc, 0x0000f7db, 0x0000f7db, 0x000097db, 0x000097db, 0x000097db},
++      {0x0000a204, 0x00000444, 0x00000444, 0x00000444, 0x00000444, 0x00000444},
++      {0x0000a208, 0x803e4788, 0x803e4788, 0x803e4788, 0x803e4788, 0x803e4788},
++      {0x0000a20c, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019},
++      {0x0000b20c, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019, 0x000c6019},
++      {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
++      {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
++      {0x0000a274, 0x0a19c652, 0x0a19c652, 0x0a1aa652, 0x0a1aa652, 0x0a1aa652},
++      {0x0000a300, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a304, 0x00003002, 0x00003002, 0x00003002, 0x00003002, 0x00003002},
++      {0x0000a308, 0x00006004, 0x00006004, 0x00008009, 0x00008009, 0x00008009},
++      {0x0000a30c, 0x0000a006, 0x0000a006, 0x0000b00b, 0x0000b00b, 0x0000b00b},
++      {0x0000a310, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012, 0x0000e012},
++      {0x0000a314, 0x00011014, 0x00011014, 0x00012048, 0x00012048, 0x00012048},
++      {0x0000a318, 0x0001504a, 0x0001504a, 0x0001604a, 0x0001604a, 0x0001604a},
++      {0x0000a31c, 0x0001904c, 0x0001904c, 0x0001a211, 0x0001a211, 0x0001a211},
++      {0x0000a320, 0x0001c04e, 0x0001c04e, 0x0001e213, 0x0001e213, 0x0001e213},
++      {0x0000a324, 0x00020092, 0x00020092, 0x0002121b, 0x0002121b, 0x0002121b},
++      {0x0000a328, 0x0002410a, 0x0002410a, 0x00024412, 0x00024412, 0x00024412},
++      {0x0000a32c, 0x0002710c, 0x0002710c, 0x00028414, 0x00028414, 0x00028414},
++      {0x0000a330, 0x0002b18b, 0x0002b18b, 0x0002b44a, 0x0002b44a, 0x0002b44a},
++      {0x0000a334, 0x0002e1cc, 0x0002e1cc, 0x00030649, 0x00030649, 0x00030649},
++      {0x0000a338, 0x000321ec, 0x000321ec, 0x0003364b, 0x0003364b, 0x0003364b},
++      {0x0000a33c, 0x000321ec, 0x000321ec, 0x00038a49, 0x00038a49, 0x00038a49},
++      {0x0000a340, 0x000321ec, 0x000321ec, 0x0003be48, 0x0003be48, 0x0003be48},
++      {0x0000a344, 0x000321ec, 0x000321ec, 0x0003ee4a, 0x0003ee4a, 0x0003ee4a},
++      {0x0000a348, 0x000321ec, 0x000321ec, 0x00042e88, 0x00042e88, 0x00042e88},
++      {0x0000a34c, 0x000321ec, 0x000321ec, 0x00046e8a, 0x00046e8a, 0x00046e8a},
++      {0x0000a350, 0x000321ec, 0x000321ec, 0x00049ec9, 0x00049ec9, 0x00049ec9},
++      {0x0000a354, 0x000321ec, 0x000321ec, 0x0004bf42, 0x0004bf42, 0x0004bf42},
++      {0x0000784c, 0x0e4f048c, 0x0e4f048c, 0x0e4d048c, 0x0e4d048c, 0x0e4d048c},
++      {0x00007854, 0x12031828, 0x12031828, 0x12035828, 0x12035828, 0x12035828},
++      {0x00007870, 0x807ec400, 0x807ec400, 0x807ec000, 0x807ec000, 0x807ec000},
++      {0x0000788c, 0x00010000, 0x00010000, 0x00110000, 0x00110000, 0x00110000},
+ };
+ static const u32 ar9280Common_9280[][2] = {
+-    { 0x0000000c, 0x00000000 },
+-    { 0x00000030, 0x00020015 },
+-    { 0x00000034, 0x00000005 },
+-    { 0x00000040, 0x00000000 },
+-    { 0x00000044, 0x00000008 },
+-    { 0x00000048, 0x00000008 },
+-    { 0x0000004c, 0x00000010 },
+-    { 0x00000050, 0x00000000 },
+-    { 0x00000054, 0x0000001f },
+-    { 0x00000800, 0x00000000 },
+-    { 0x00000804, 0x00000000 },
+-    { 0x00000808, 0x00000000 },
+-    { 0x0000080c, 0x00000000 },
+-    { 0x00000810, 0x00000000 },
+-    { 0x00000814, 0x00000000 },
+-    { 0x00000818, 0x00000000 },
+-    { 0x0000081c, 0x00000000 },
+-    { 0x00000820, 0x00000000 },
+-    { 0x00000824, 0x00000000 },
+-    { 0x00001040, 0x002ffc0f },
+-    { 0x00001044, 0x002ffc0f },
+-    { 0x00001048, 0x002ffc0f },
+-    { 0x0000104c, 0x002ffc0f },
+-    { 0x00001050, 0x002ffc0f },
+-    { 0x00001054, 0x002ffc0f },
+-    { 0x00001058, 0x002ffc0f },
+-    { 0x0000105c, 0x002ffc0f },
+-    { 0x00001060, 0x002ffc0f },
+-    { 0x00001064, 0x002ffc0f },
+-    { 0x00001230, 0x00000000 },
+-    { 0x00001270, 0x00000000 },
+-    { 0x00001038, 0x00000000 },
+-    { 0x00001078, 0x00000000 },
+-    { 0x000010b8, 0x00000000 },
+-    { 0x000010f8, 0x00000000 },
+-    { 0x00001138, 0x00000000 },
+-    { 0x00001178, 0x00000000 },
+-    { 0x000011b8, 0x00000000 },
+-    { 0x000011f8, 0x00000000 },
+-    { 0x00001238, 0x00000000 },
+-    { 0x00001278, 0x00000000 },
+-    { 0x000012b8, 0x00000000 },
+-    { 0x000012f8, 0x00000000 },
+-    { 0x00001338, 0x00000000 },
+-    { 0x00001378, 0x00000000 },
+-    { 0x000013b8, 0x00000000 },
+-    { 0x000013f8, 0x00000000 },
+-    { 0x00001438, 0x00000000 },
+-    { 0x00001478, 0x00000000 },
+-    { 0x000014b8, 0x00000000 },
+-    { 0x000014f8, 0x00000000 },
+-    { 0x00001538, 0x00000000 },
+-    { 0x00001578, 0x00000000 },
+-    { 0x000015b8, 0x00000000 },
+-    { 0x000015f8, 0x00000000 },
+-    { 0x00001638, 0x00000000 },
+-    { 0x00001678, 0x00000000 },
+-    { 0x000016b8, 0x00000000 },
+-    { 0x000016f8, 0x00000000 },
+-    { 0x00001738, 0x00000000 },
+-    { 0x00001778, 0x00000000 },
+-    { 0x000017b8, 0x00000000 },
+-    { 0x000017f8, 0x00000000 },
+-    { 0x0000103c, 0x00000000 },
+-    { 0x0000107c, 0x00000000 },
+-    { 0x000010bc, 0x00000000 },
+-    { 0x000010fc, 0x00000000 },
+-    { 0x0000113c, 0x00000000 },
+-    { 0x0000117c, 0x00000000 },
+-    { 0x000011bc, 0x00000000 },
+-    { 0x000011fc, 0x00000000 },
+-    { 0x0000123c, 0x00000000 },
+-    { 0x0000127c, 0x00000000 },
+-    { 0x000012bc, 0x00000000 },
+-    { 0x000012fc, 0x00000000 },
+-    { 0x0000133c, 0x00000000 },
+-    { 0x0000137c, 0x00000000 },
+-    { 0x000013bc, 0x00000000 },
+-    { 0x000013fc, 0x00000000 },
+-    { 0x0000143c, 0x00000000 },
+-    { 0x0000147c, 0x00000000 },
+-    { 0x00004030, 0x00000002 },
+-    { 0x0000403c, 0x00000002 },
+-    { 0x00004024, 0x0000001f },
+-    { 0x00007010, 0x00000033 },
+-    { 0x00007038, 0x000004c2 },
+-    { 0x00008004, 0x00000000 },
+-    { 0x00008008, 0x00000000 },
+-    { 0x0000800c, 0x00000000 },
+-    { 0x00008018, 0x00000700 },
+-    { 0x00008020, 0x00000000 },
+-    { 0x00008038, 0x00000000 },
+-    { 0x0000803c, 0x00000000 },
+-    { 0x00008048, 0x40000000 },
+-    { 0x00008054, 0x00000000 },
+-    { 0x00008058, 0x00000000 },
+-    { 0x0000805c, 0x000fc78f },
+-    { 0x00008060, 0x0000000f },
+-    { 0x00008064, 0x00000000 },
+-    { 0x00008070, 0x00000000 },
+-    { 0x000080c0, 0x2a82301a },
+-    { 0x000080c4, 0x05dc01e0 },
+-    { 0x000080c8, 0x1f402710 },
+-    { 0x000080cc, 0x01f40000 },
+-    { 0x000080d0, 0x00001e00 },
+-    { 0x000080d4, 0x00000000 },
+-    { 0x000080d8, 0x00400000 },
+-    { 0x000080e0, 0xffffffff },
+-    { 0x000080e4, 0x0000ffff },
+-    { 0x000080e8, 0x003f3f3f },
+-    { 0x000080ec, 0x00000000 },
+-    { 0x000080f0, 0x00000000 },
+-    { 0x000080f4, 0x00000000 },
+-    { 0x000080f8, 0x00000000 },
+-    { 0x000080fc, 0x00020000 },
+-    { 0x00008100, 0x00020000 },
+-    { 0x00008104, 0x00000001 },
+-    { 0x00008108, 0x00000052 },
+-    { 0x0000810c, 0x00000000 },
+-    { 0x00008110, 0x00000168 },
+-    { 0x00008118, 0x000100aa },
+-    { 0x0000811c, 0x00003210 },
+-    { 0x00008120, 0x08f04800 },
+-    { 0x00008124, 0x00000000 },
+-    { 0x00008128, 0x00000000 },
+-    { 0x0000812c, 0x00000000 },
+-    { 0x00008130, 0x00000000 },
+-    { 0x00008134, 0x00000000 },
+-    { 0x00008138, 0x00000000 },
+-    { 0x0000813c, 0x00000000 },
+-    { 0x00008144, 0x00000000 },
+-    { 0x00008168, 0x00000000 },
+-    { 0x0000816c, 0x00000000 },
+-    { 0x00008170, 0x32143320 },
+-    { 0x00008174, 0xfaa4fa50 },
+-    { 0x00008178, 0x00000100 },
+-    { 0x0000817c, 0x00000000 },
+-    { 0x000081c4, 0x00000000 },
+-    { 0x000081d0, 0x00003210 },
+-    { 0x000081ec, 0x00000000 },
+-    { 0x000081f0, 0x00000000 },
+-    { 0x000081f4, 0x00000000 },
+-    { 0x000081f8, 0x00000000 },
+-    { 0x000081fc, 0x00000000 },
+-    { 0x00008200, 0x00000000 },
+-    { 0x00008204, 0x00000000 },
+-    { 0x00008208, 0x00000000 },
+-    { 0x0000820c, 0x00000000 },
+-    { 0x00008210, 0x00000000 },
+-    { 0x00008214, 0x00000000 },
+-    { 0x00008218, 0x00000000 },
+-    { 0x0000821c, 0x00000000 },
+-    { 0x00008220, 0x00000000 },
+-    { 0x00008224, 0x00000000 },
+-    { 0x00008228, 0x00000000 },
+-    { 0x0000822c, 0x00000000 },
+-    { 0x00008230, 0x00000000 },
+-    { 0x00008234, 0x00000000 },
+-    { 0x00008238, 0x00000000 },
+-    { 0x0000823c, 0x00000000 },
+-    { 0x00008240, 0x00100000 },
+-    { 0x00008244, 0x0010f400 },
+-    { 0x00008248, 0x00000100 },
+-    { 0x0000824c, 0x0001e800 },
+-    { 0x00008250, 0x00000000 },
+-    { 0x00008254, 0x00000000 },
+-    { 0x00008258, 0x00000000 },
+-    { 0x0000825c, 0x400000ff },
+-    { 0x00008260, 0x00080922 },
+-    { 0x00008270, 0x00000000 },
+-    { 0x00008274, 0x40000000 },
+-    { 0x00008278, 0x003e4180 },
+-    { 0x0000827c, 0x00000000 },
+-    { 0x00008284, 0x0000002c },
+-    { 0x00008288, 0x0000002c },
+-    { 0x0000828c, 0x00000000 },
+-    { 0x00008294, 0x00000000 },
+-    { 0x00008298, 0x00000000 },
+-    { 0x00008300, 0x00000000 },
+-    { 0x00008304, 0x00000000 },
+-    { 0x00008308, 0x00000000 },
+-    { 0x0000830c, 0x00000000 },
+-    { 0x00008310, 0x00000000 },
+-    { 0x00008314, 0x00000000 },
+-    { 0x00008318, 0x00000000 },
+-    { 0x00008328, 0x00000000 },
+-    { 0x0000832c, 0x00000007 },
+-    { 0x00008330, 0x00000302 },
+-    { 0x00008334, 0x00000e00 },
+-    { 0x00008338, 0x00000000 },
+-    { 0x0000833c, 0x00000000 },
+-    { 0x00008340, 0x000107ff },
+-    { 0x00008344, 0x00000000 },
+-    { 0x00009808, 0x00000000 },
+-    { 0x0000980c, 0xaf268e30 },
+-    { 0x00009810, 0xfd14e000 },
+-    { 0x00009814, 0x9c0a9f6b },
+-    { 0x0000981c, 0x00000000 },
+-    { 0x0000982c, 0x0000a000 },
+-    { 0x00009830, 0x00000000 },
+-    { 0x0000983c, 0x00200400 },
+-    { 0x00009840, 0x206a01ae },
+-    { 0x0000984c, 0x0040233c },
+-    { 0x0000a84c, 0x0040233c },
+-    { 0x00009854, 0x00000044 },
+-    { 0x00009900, 0x00000000 },
+-    { 0x00009904, 0x00000000 },
+-    { 0x00009908, 0x00000000 },
+-    { 0x0000990c, 0x00000000 },
+-    { 0x0000991c, 0x10000fff },
+-    { 0x00009920, 0x04900000 },
+-    { 0x0000a920, 0x04900000 },
+-    { 0x00009928, 0x00000001 },
+-    { 0x0000992c, 0x00000004 },
+-    { 0x00009934, 0x1e1f2022 },
+-    { 0x00009938, 0x0a0b0c0d },
+-    { 0x0000993c, 0x00000000 },
+-    { 0x00009948, 0x9280c00a },
+-    { 0x0000994c, 0x00020028 },
+-    { 0x00009954, 0xe250a51e },
+-    { 0x00009958, 0x3388ffff },
+-    { 0x00009940, 0x00781204 },
+-    { 0x0000c95c, 0x004b6a8e },
+-    { 0x0000c968, 0x000003ce },
+-    { 0x00009970, 0x190fb514 },
+-    { 0x00009974, 0x00000000 },
+-    { 0x00009978, 0x00000001 },
+-    { 0x0000997c, 0x00000000 },
+-    { 0x00009980, 0x00000000 },
+-    { 0x00009984, 0x00000000 },
+-    { 0x00009988, 0x00000000 },
+-    { 0x0000998c, 0x00000000 },
+-    { 0x00009990, 0x00000000 },
+-    { 0x00009994, 0x00000000 },
+-    { 0x00009998, 0x00000000 },
+-    { 0x0000999c, 0x00000000 },
+-    { 0x000099a0, 0x00000000 },
+-    { 0x000099a4, 0x00000001 },
+-    { 0x000099a8, 0x201fff00 },
+-    { 0x000099ac, 0x006f00c4 },
+-    { 0x000099b0, 0x03051000 },
+-    { 0x000099b4, 0x00000820 },
+-    { 0x000099dc, 0x00000000 },
+-    { 0x000099e0, 0x00000000 },
+-    { 0x000099e4, 0xaaaaaaaa },
+-    { 0x000099e8, 0x3c466478 },
+-    { 0x000099ec, 0x0cc80caa },
+-    { 0x000099fc, 0x00001042 },
+-    { 0x0000a210, 0x4080a333 },
+-    { 0x0000a214, 0x40206c10 },
+-    { 0x0000a218, 0x009c4060 },
+-    { 0x0000a220, 0x01834061 },
+-    { 0x0000a224, 0x00000400 },
+-    { 0x0000a228, 0x000003b5 },
+-    { 0x0000a22c, 0x23277200 },
+-    { 0x0000a234, 0x20202020 },
+-    { 0x0000a238, 0x20202020 },
+-    { 0x0000a23c, 0x13c889af },
+-    { 0x0000a240, 0x38490a20 },
+-    { 0x0000a244, 0x00007bb6 },
+-    { 0x0000a248, 0x0fff3ffc },
+-    { 0x0000a24c, 0x00000001 },
+-    { 0x0000a250, 0x001da000 },
+-    { 0x0000a254, 0x00000000 },
+-    { 0x0000a258, 0x0cdbd380 },
+-    { 0x0000a25c, 0x0f0f0f01 },
+-    { 0x0000a260, 0xdfa91f01 },
+-    { 0x0000a268, 0x00000000 },
+-    { 0x0000a26c, 0x0ebae9c6 },
+-    { 0x0000b26c, 0x0ebae9c6 },
+-    { 0x0000d270, 0x00820820 },
+-    { 0x0000a278, 0x1ce739ce },
+-    { 0x0000a27c, 0x050701ce },
+-    { 0x0000a358, 0x7999aa0f },
+-    { 0x0000d35c, 0x07ffffef },
+-    { 0x0000d360, 0x0fffffe7 },
+-    { 0x0000d364, 0x17ffffe5 },
+-    { 0x0000d368, 0x1fffffe4 },
+-    { 0x0000d36c, 0x37ffffe3 },
+-    { 0x0000d370, 0x3fffffe3 },
+-    { 0x0000d374, 0x57ffffe3 },
+-    { 0x0000d378, 0x5fffffe2 },
+-    { 0x0000d37c, 0x7fffffe2 },
+-    { 0x0000d380, 0x7f3c7bba },
+-    { 0x0000d384, 0xf3307ff0 },
+-    { 0x0000a388, 0x0c000000 },
+-    { 0x0000a38c, 0x20202020 },
+-    { 0x0000a390, 0x20202020 },
+-    { 0x0000a394, 0x1ce739ce },
+-    { 0x0000a398, 0x000001ce },
+-    { 0x0000a39c, 0x00000001 },
+-    { 0x0000a3a0, 0x00000000 },
+-    { 0x0000a3a4, 0x00000000 },
+-    { 0x0000a3a8, 0x00000000 },
+-    { 0x0000a3ac, 0x00000000 },
+-    { 0x0000a3b0, 0x00000000 },
+-    { 0x0000a3b4, 0x00000000 },
+-    { 0x0000a3b8, 0x00000000 },
+-    { 0x0000a3bc, 0x00000000 },
+-    { 0x0000a3c0, 0x00000000 },
+-    { 0x0000a3c4, 0x00000000 },
+-    { 0x0000a3c8, 0x00000246 },
+-    { 0x0000a3cc, 0x20202020 },
+-    { 0x0000a3d0, 0x20202020 },
+-    { 0x0000a3d4, 0x20202020 },
+-    { 0x0000a3dc, 0x1ce739ce },
+-    { 0x0000a3e0, 0x000001ce },
+-    { 0x0000a3e4, 0x00000000 },
+-    { 0x0000a3e8, 0x18c43433 },
+-    { 0x0000a3ec, 0x00f38081 },
+-    { 0x00007800, 0x00040000 },
+-    { 0x00007804, 0xdb005012 },
+-    { 0x00007808, 0x04924914 },
+-    { 0x0000780c, 0x21084210 },
+-    { 0x00007810, 0x6d801300 },
+-    { 0x00007814, 0x0019beff },
+-    { 0x00007818, 0x07e40000 },
+-    { 0x0000781c, 0x00492000 },
+-    { 0x00007820, 0x92492480 },
+-    { 0x00007824, 0x00040000 },
+-    { 0x00007828, 0xdb005012 },
+-    { 0x0000782c, 0x04924914 },
+-    { 0x00007830, 0x21084210 },
+-    { 0x00007834, 0x6d801300 },
+-    { 0x00007838, 0x0019beff },
+-    { 0x0000783c, 0x07e40000 },
+-    { 0x00007840, 0x00492000 },
+-    { 0x00007844, 0x92492480 },
+-    { 0x00007848, 0x00120000 },
+-    { 0x00007850, 0x54214514 },
+-    { 0x00007858, 0x92592692 },
+-    { 0x00007860, 0x52802000 },
+-    { 0x00007864, 0x0a8e370e },
+-    { 0x00007868, 0xc0102850 },
+-    { 0x0000786c, 0x812d4000 },
+-    { 0x00007874, 0x001b6db0 },
+-    { 0x00007878, 0x00376b63 },
+-    { 0x0000787c, 0x06db6db6 },
+-    { 0x00007880, 0x006d8000 },
+-    { 0x00007884, 0xffeffffe },
+-    { 0x00007888, 0xffeffffe },
+-    { 0x00007890, 0x00060aeb },
+-    { 0x00007894, 0x5a108000 },
+-    { 0x00007898, 0x2a850160 },
++      /* Addr      allmodes  */
++      {0x0000000c, 0x00000000},
++      {0x00000030, 0x00020015},
++      {0x00000034, 0x00000005},
++      {0x00000040, 0x00000000},
++      {0x00000044, 0x00000008},
++      {0x00000048, 0x00000008},
++      {0x0000004c, 0x00000010},
++      {0x00000050, 0x00000000},
++      {0x00000054, 0x0000001f},
++      {0x00000800, 0x00000000},
++      {0x00000804, 0x00000000},
++      {0x00000808, 0x00000000},
++      {0x0000080c, 0x00000000},
++      {0x00000810, 0x00000000},
++      {0x00000814, 0x00000000},
++      {0x00000818, 0x00000000},
++      {0x0000081c, 0x00000000},
++      {0x00000820, 0x00000000},
++      {0x00000824, 0x00000000},
++      {0x00001040, 0x002ffc0f},
++      {0x00001044, 0x002ffc0f},
++      {0x00001048, 0x002ffc0f},
++      {0x0000104c, 0x002ffc0f},
++      {0x00001050, 0x002ffc0f},
++      {0x00001054, 0x002ffc0f},
++      {0x00001058, 0x002ffc0f},
++      {0x0000105c, 0x002ffc0f},
++      {0x00001060, 0x002ffc0f},
++      {0x00001064, 0x002ffc0f},
++      {0x00001230, 0x00000000},
++      {0x00001270, 0x00000000},
++      {0x00001038, 0x00000000},
++      {0x00001078, 0x00000000},
++      {0x000010b8, 0x00000000},
++      {0x000010f8, 0x00000000},
++      {0x00001138, 0x00000000},
++      {0x00001178, 0x00000000},
++      {0x000011b8, 0x00000000},
++      {0x000011f8, 0x00000000},
++      {0x00001238, 0x00000000},
++      {0x00001278, 0x00000000},
++      {0x000012b8, 0x00000000},
++      {0x000012f8, 0x00000000},
++      {0x00001338, 0x00000000},
++      {0x00001378, 0x00000000},
++      {0x000013b8, 0x00000000},
++      {0x000013f8, 0x00000000},
++      {0x00001438, 0x00000000},
++      {0x00001478, 0x00000000},
++      {0x000014b8, 0x00000000},
++      {0x000014f8, 0x00000000},
++      {0x00001538, 0x00000000},
++      {0x00001578, 0x00000000},
++      {0x000015b8, 0x00000000},
++      {0x000015f8, 0x00000000},
++      {0x00001638, 0x00000000},
++      {0x00001678, 0x00000000},
++      {0x000016b8, 0x00000000},
++      {0x000016f8, 0x00000000},
++      {0x00001738, 0x00000000},
++      {0x00001778, 0x00000000},
++      {0x000017b8, 0x00000000},
++      {0x000017f8, 0x00000000},
++      {0x0000103c, 0x00000000},
++      {0x0000107c, 0x00000000},
++      {0x000010bc, 0x00000000},
++      {0x000010fc, 0x00000000},
++      {0x0000113c, 0x00000000},
++      {0x0000117c, 0x00000000},
++      {0x000011bc, 0x00000000},
++      {0x000011fc, 0x00000000},
++      {0x0000123c, 0x00000000},
++      {0x0000127c, 0x00000000},
++      {0x000012bc, 0x00000000},
++      {0x000012fc, 0x00000000},
++      {0x0000133c, 0x00000000},
++      {0x0000137c, 0x00000000},
++      {0x000013bc, 0x00000000},
++      {0x000013fc, 0x00000000},
++      {0x0000143c, 0x00000000},
++      {0x0000147c, 0x00000000},
++      {0x00004030, 0x00000002},
++      {0x0000403c, 0x00000002},
++      {0x00004024, 0x0000001f},
++      {0x00007010, 0x00000033},
++      {0x00007038, 0x000004c2},
++      {0x00008004, 0x00000000},
++      {0x00008008, 0x00000000},
++      {0x0000800c, 0x00000000},
++      {0x00008018, 0x00000700},
++      {0x00008020, 0x00000000},
++      {0x00008038, 0x00000000},
++      {0x0000803c, 0x00000000},
++      {0x00008048, 0x40000000},
++      {0x00008054, 0x00000000},
++      {0x00008058, 0x00000000},
++      {0x0000805c, 0x000fc78f},
++      {0x00008060, 0x0000000f},
++      {0x00008064, 0x00000000},
++      {0x00008070, 0x00000000},
++      {0x000080c0, 0x2a82301a},
++      {0x000080c4, 0x05dc01e0},
++      {0x000080c8, 0x1f402710},
++      {0x000080cc, 0x01f40000},
++      {0x000080d0, 0x00001e00},
++      {0x000080d4, 0x00000000},
++      {0x000080d8, 0x00400000},
++      {0x000080e0, 0xffffffff},
++      {0x000080e4, 0x0000ffff},
++      {0x000080e8, 0x003f3f3f},
++      {0x000080ec, 0x00000000},
++      {0x000080f0, 0x00000000},
++      {0x000080f4, 0x00000000},
++      {0x000080f8, 0x00000000},
++      {0x000080fc, 0x00020000},
++      {0x00008100, 0x00020000},
++      {0x00008104, 0x00000001},
++      {0x00008108, 0x00000052},
++      {0x0000810c, 0x00000000},
++      {0x00008110, 0x00000168},
++      {0x00008118, 0x000100aa},
++      {0x0000811c, 0x00003210},
++      {0x00008120, 0x08f04800},
++      {0x00008124, 0x00000000},
++      {0x00008128, 0x00000000},
++      {0x0000812c, 0x00000000},
++      {0x00008130, 0x00000000},
++      {0x00008134, 0x00000000},
++      {0x00008138, 0x00000000},
++      {0x0000813c, 0x00000000},
++      {0x00008144, 0x00000000},
++      {0x00008168, 0x00000000},
++      {0x0000816c, 0x00000000},
++      {0x00008170, 0x32143320},
++      {0x00008174, 0xfaa4fa50},
++      {0x00008178, 0x00000100},
++      {0x0000817c, 0x00000000},
++      {0x000081c4, 0x00000000},
++      {0x000081d0, 0x00003210},
++      {0x000081ec, 0x00000000},
++      {0x000081f0, 0x00000000},
++      {0x000081f4, 0x00000000},
++      {0x000081f8, 0x00000000},
++      {0x000081fc, 0x00000000},
++      {0x00008200, 0x00000000},
++      {0x00008204, 0x00000000},
++      {0x00008208, 0x00000000},
++      {0x0000820c, 0x00000000},
++      {0x00008210, 0x00000000},
++      {0x00008214, 0x00000000},
++      {0x00008218, 0x00000000},
++      {0x0000821c, 0x00000000},
++      {0x00008220, 0x00000000},
++      {0x00008224, 0x00000000},
++      {0x00008228, 0x00000000},
++      {0x0000822c, 0x00000000},
++      {0x00008230, 0x00000000},
++      {0x00008234, 0x00000000},
++      {0x00008238, 0x00000000},
++      {0x0000823c, 0x00000000},
++      {0x00008240, 0x00100000},
++      {0x00008244, 0x0010f400},
++      {0x00008248, 0x00000100},
++      {0x0000824c, 0x0001e800},
++      {0x00008250, 0x00000000},
++      {0x00008254, 0x00000000},
++      {0x00008258, 0x00000000},
++      {0x0000825c, 0x400000ff},
++      {0x00008260, 0x00080922},
++      {0x00008270, 0x00000000},
++      {0x00008274, 0x40000000},
++      {0x00008278, 0x003e4180},
++      {0x0000827c, 0x00000000},
++      {0x00008284, 0x0000002c},
++      {0x00008288, 0x0000002c},
++      {0x0000828c, 0x00000000},
++      {0x00008294, 0x00000000},
++      {0x00008298, 0x00000000},
++      {0x00008300, 0x00000000},
++      {0x00008304, 0x00000000},
++      {0x00008308, 0x00000000},
++      {0x0000830c, 0x00000000},
++      {0x00008310, 0x00000000},
++      {0x00008314, 0x00000000},
++      {0x00008318, 0x00000000},
++      {0x00008328, 0x00000000},
++      {0x0000832c, 0x00000007},
++      {0x00008330, 0x00000302},
++      {0x00008334, 0x00000e00},
++      {0x00008338, 0x00000000},
++      {0x0000833c, 0x00000000},
++      {0x00008340, 0x000107ff},
++      {0x00008344, 0x00000000},
++      {0x00009808, 0x00000000},
++      {0x0000980c, 0xaf268e30},
++      {0x00009810, 0xfd14e000},
++      {0x00009814, 0x9c0a9f6b},
++      {0x0000981c, 0x00000000},
++      {0x0000982c, 0x0000a000},
++      {0x00009830, 0x00000000},
++      {0x0000983c, 0x00200400},
++      {0x00009840, 0x206a01ae},
++      {0x0000984c, 0x0040233c},
++      {0x0000a84c, 0x0040233c},
++      {0x00009854, 0x00000044},
++      {0x00009900, 0x00000000},
++      {0x00009904, 0x00000000},
++      {0x00009908, 0x00000000},
++      {0x0000990c, 0x00000000},
++      {0x0000991c, 0x10000fff},
++      {0x00009920, 0x04900000},
++      {0x0000a920, 0x04900000},
++      {0x00009928, 0x00000001},
++      {0x0000992c, 0x00000004},
++      {0x00009934, 0x1e1f2022},
++      {0x00009938, 0x0a0b0c0d},
++      {0x0000993c, 0x00000000},
++      {0x00009948, 0x9280c00a},
++      {0x0000994c, 0x00020028},
++      {0x00009954, 0xe250a51e},
++      {0x00009958, 0x3388ffff},
++      {0x00009940, 0x00781204},
++      {0x0000c95c, 0x004b6a8e},
++      {0x0000c968, 0x000003ce},
++      {0x00009970, 0x190fb514},
++      {0x00009974, 0x00000000},
++      {0x00009978, 0x00000001},
++      {0x0000997c, 0x00000000},
++      {0x00009980, 0x00000000},
++      {0x00009984, 0x00000000},
++      {0x00009988, 0x00000000},
++      {0x0000998c, 0x00000000},
++      {0x00009990, 0x00000000},
++      {0x00009994, 0x00000000},
++      {0x00009998, 0x00000000},
++      {0x0000999c, 0x00000000},
++      {0x000099a0, 0x00000000},
++      {0x000099a4, 0x00000001},
++      {0x000099a8, 0x201fff00},
++      {0x000099ac, 0x006f00c4},
++      {0x000099b0, 0x03051000},
++      {0x000099b4, 0x00000820},
++      {0x000099dc, 0x00000000},
++      {0x000099e0, 0x00000000},
++      {0x000099e4, 0xaaaaaaaa},
++      {0x000099e8, 0x3c466478},
++      {0x000099ec, 0x0cc80caa},
++      {0x000099fc, 0x00001042},
++      {0x0000a210, 0x4080a333},
++      {0x0000a214, 0x40206c10},
++      {0x0000a218, 0x009c4060},
++      {0x0000a220, 0x01834061},
++      {0x0000a224, 0x00000400},
++      {0x0000a228, 0x000003b5},
++      {0x0000a22c, 0x23277200},
++      {0x0000a234, 0x20202020},
++      {0x0000a238, 0x20202020},
++      {0x0000a23c, 0x13c889af},
++      {0x0000a240, 0x38490a20},
++      {0x0000a244, 0x00007bb6},
++      {0x0000a248, 0x0fff3ffc},
++      {0x0000a24c, 0x00000001},
++      {0x0000a250, 0x001da000},
++      {0x0000a254, 0x00000000},
++      {0x0000a258, 0x0cdbd380},
++      {0x0000a25c, 0x0f0f0f01},
++      {0x0000a260, 0xdfa91f01},
++      {0x0000a268, 0x00000000},
++      {0x0000a26c, 0x0ebae9c6},
++      {0x0000b26c, 0x0ebae9c6},
++      {0x0000d270, 0x00820820},
++      {0x0000a278, 0x1ce739ce},
++      {0x0000a27c, 0x050701ce},
++      {0x0000a358, 0x7999aa0f},
++      {0x0000d35c, 0x07ffffef},
++      {0x0000d360, 0x0fffffe7},
++      {0x0000d364, 0x17ffffe5},
++      {0x0000d368, 0x1fffffe4},
++      {0x0000d36c, 0x37ffffe3},
++      {0x0000d370, 0x3fffffe3},
++      {0x0000d374, 0x57ffffe3},
++      {0x0000d378, 0x5fffffe2},
++      {0x0000d37c, 0x7fffffe2},
++      {0x0000d380, 0x7f3c7bba},
++      {0x0000d384, 0xf3307ff0},
++      {0x0000a388, 0x0c000000},
++      {0x0000a38c, 0x20202020},
++      {0x0000a390, 0x20202020},
++      {0x0000a394, 0x1ce739ce},
++      {0x0000a398, 0x000001ce},
++      {0x0000a39c, 0x00000001},
++      {0x0000a3a0, 0x00000000},
++      {0x0000a3a4, 0x00000000},
++      {0x0000a3a8, 0x00000000},
++      {0x0000a3ac, 0x00000000},
++      {0x0000a3b0, 0x00000000},
++      {0x0000a3b4, 0x00000000},
++      {0x0000a3b8, 0x00000000},
++      {0x0000a3bc, 0x00000000},
++      {0x0000a3c0, 0x00000000},
++      {0x0000a3c4, 0x00000000},
++      {0x0000a3c8, 0x00000246},
++      {0x0000a3cc, 0x20202020},
++      {0x0000a3d0, 0x20202020},
++      {0x0000a3d4, 0x20202020},
++      {0x0000a3dc, 0x1ce739ce},
++      {0x0000a3e0, 0x000001ce},
++      {0x0000a3e4, 0x00000000},
++      {0x0000a3e8, 0x18c43433},
++      {0x0000a3ec, 0x00f38081},
++      {0x00007800, 0x00040000},
++      {0x00007804, 0xdb005012},
++      {0x00007808, 0x04924914},
++      {0x0000780c, 0x21084210},
++      {0x00007810, 0x6d801300},
++      {0x00007814, 0x0019beff},
++      {0x00007818, 0x07e40000},
++      {0x0000781c, 0x00492000},
++      {0x00007820, 0x92492480},
++      {0x00007824, 0x00040000},
++      {0x00007828, 0xdb005012},
++      {0x0000782c, 0x04924914},
++      {0x00007830, 0x21084210},
++      {0x00007834, 0x6d801300},
++      {0x00007838, 0x0019beff},
++      {0x0000783c, 0x07e40000},
++      {0x00007840, 0x00492000},
++      {0x00007844, 0x92492480},
++      {0x00007848, 0x00120000},
++      {0x00007850, 0x54214514},
++      {0x00007858, 0x92592692},
++      {0x00007860, 0x52802000},
++      {0x00007864, 0x0a8e370e},
++      {0x00007868, 0xc0102850},
++      {0x0000786c, 0x812d4000},
++      {0x00007874, 0x001b6db0},
++      {0x00007878, 0x00376b63},
++      {0x0000787c, 0x06db6db6},
++      {0x00007880, 0x006d8000},
++      {0x00007884, 0xffeffffe},
++      {0x00007888, 0xffeffffe},
++      {0x00007890, 0x00060aeb},
++      {0x00007894, 0x5a108000},
++      {0x00007898, 0x2a850160},
+ };
+-/* XXX 9280 2 */
+ static const u32 ar9280Modes_9280_2[][6] = {
+-    { 0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0 },
+-    { 0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0 },
+-    { 0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180 },
+-    { 0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008 },
+-    { 0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0 },
+-    { 0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f },
+-    { 0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810 },
+-    { 0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a },
+-    { 0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880 },
+-    { 0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303 },
+-    { 0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200 },
+-    { 0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e },
+-    { 0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001 },
+-    { 0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e },
+-    { 0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007 },
+-    { 0x00009840, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e, 0x206a012e },
+-    { 0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0 },
+-    { 0x00009850, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2, 0x6c4000e2 },
+-    { 0x00009858, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e },
+-    { 0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e },
+-    { 0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18 },
+-    { 0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 },
+-    { 0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0 },
+-    { 0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881 },
+-    { 0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0 },
+-    { 0x00009918, 0x0000000a, 0x00000014, 0x00000268, 0x0000000b, 0x00000016 },
+-    { 0x00009924, 0xd00a8a0b, 0xd00a8a0b, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d },
+-    { 0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010 },
+-    { 0x00009960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
+-    { 0x0000a960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 },
+-    { 0x00009964, 0x00000210, 0x00000210, 0x00000210, 0x00000210, 0x00000210 },
+-    { 0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce },
+-    { 0x000099b8, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c },
+-    { 0x000099bc, 0x00000a00, 0x00000a00, 0x00000c00, 0x00000c00, 0x00000c00 },
+-    { 0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4 },
+-    { 0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77 },
+-    { 0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329 },
+-    { 0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8 },
+-    { 0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384 },
+-    { 0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x0000a204, 0x00000444, 0x00000444, 0x00000444, 0x00000444, 0x00000444 },
+-    { 0x0000a20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019 },
+-    { 0x0000b20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019 },
+-    { 0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a },
+-    { 0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000 },
+-    { 0x0000a23c, 0x13c88000, 0x13c88000, 0x13c88001, 0x13c88000, 0x13c88000 },
+-    { 0x0000a250, 0x001ff000, 0x001ff000, 0x0004a000, 0x0004a000, 0x0004a000 },
+-    { 0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e },
+-    { 0x0000a388, 0x0c000000, 0x0c000000, 0x08000000, 0x0c000000, 0x0c000000 },
+-    { 0x0000a3d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 },
+-    { 0x00007894, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000 },
++      {0x00001030, 0x00000230, 0x00000460, 0x000002c0, 0x00000160, 0x000001e0},
++      {0x00001070, 0x00000168, 0x000002d0, 0x00000318, 0x0000018c, 0x000001e0},
++      {0x000010b0, 0x00000e60, 0x00001cc0, 0x00007c70, 0x00003e38, 0x00001180},
++      {0x000010f0, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000008},
++      {0x00008014, 0x03e803e8, 0x07d007d0, 0x10801600, 0x08400b00, 0x06e006e0},
++      {0x0000801c, 0x128d8027, 0x128d804f, 0x12e00057, 0x12e0002b, 0x0988004f},
++      {0x00008120, 0x08f04800, 0x08f04800, 0x08f04810, 0x08f04810, 0x08f04810},
++      {0x000081d0, 0x00003210, 0x00003210, 0x0000320a, 0x0000320a, 0x0000320a},
++      {0x00008318, 0x00003e80, 0x00007d00, 0x00006880, 0x00003440, 0x00006880},
++      {0x00009804, 0x00000300, 0x000003c4, 0x000003c4, 0x00000300, 0x00000303},
++      {0x00009820, 0x02020200, 0x02020200, 0x02020200, 0x02020200, 0x02020200},
++      {0x00009824, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
++      {0x00009828, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001, 0x0a020001},
++      {0x00009834, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
++      {0x00009838, 0x00000007, 0x00000007, 0x00000007, 0x00000007, 0x00000007},
++      {0x00009840, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e, 0x206a012e},
++      {0x00009844, 0x0372161e, 0x0372161e, 0x037216a0, 0x037216a0, 0x037216a0},
++      {0x00009850, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2, 0x6c4000e2},
++      {0x00009858, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e, 0x7ec84d2e},
++      {0x0000985c, 0x31395d5e, 0x3139605e, 0x3139605e, 0x31395d5e, 0x31395d5e},
++      {0x00009860, 0x00048d18, 0x00048d18, 0x00048d20, 0x00048d20, 0x00048d18},
++      {0x00009864, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00},
++      {0x00009868, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
++      {0x0000986c, 0x06903081, 0x06903081, 0x06903881, 0x06903881, 0x06903881},
++      {0x00009914, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898, 0x000007d0},
++      {0x00009918, 0x0000000a, 0x00000014, 0x00000268, 0x0000000b, 0x00000016},
++      {0x00009924, 0xd00a8a0b, 0xd00a8a0b, 0xd00a8a0d, 0xd00a8a0d, 0xd00a8a0d},
++      {0x00009944, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010, 0xffbc1010},
++      {0x00009960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010},
++      {0x0000a960, 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010},
++      {0x00009964, 0x00000210, 0x00000210, 0x00000210, 0x00000210, 0x00000210},
++      {0x0000c968, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce, 0x000003ce},
++      {0x000099b8, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c, 0x0000001c},
++      {0x000099bc, 0x00000a00, 0x00000a00, 0x00000c00, 0x00000c00, 0x00000c00},
++      {0x000099c0, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
++      {0x000099c4, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77, 0x06336f77},
++      {0x000099c8, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329, 0x60f65329},
++      {0x000099cc, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8, 0x08f186c8},
++      {0x000099d0, 0x00046384, 0x00046384, 0x00046384, 0x00046384, 0x00046384},
++      {0x000099d4, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x000099d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x0000a204, 0x00000444, 0x00000444, 0x00000444, 0x00000444, 0x00000444},
++      {0x0000a20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019},
++      {0x0000b20c, 0x00000014, 0x00000014, 0x0001f019, 0x0001f019, 0x0001f019},
++      {0x0000a21c, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a, 0x1883800a},
++      {0x0000a230, 0x00000000, 0x00000000, 0x00000210, 0x00000108, 0x00000000},
++      {0x0000a23c, 0x13c88000, 0x13c88000, 0x13c88001, 0x13c88000, 0x13c88000},
++      {0x0000a250, 0x001ff000, 0x001ff000, 0x0004a000, 0x0004a000, 0x0004a000},
++      {0x0000a358, 0x7999aa02, 0x7999aa02, 0x7999aa0e, 0x7999aa0e, 0x7999aa0e},
++      {0x0000a388, 0x0c000000, 0x0c000000, 0x08000000, 0x0c000000, 0x0c000000},
++      {0x0000a3d8, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
++      {0x00007894, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000, 0x5a508000},
+ };
+ static const u32 ar9280Common_9280_2[][2] = {
+-    { 0x0000000c, 0x00000000 },
+-    { 0x00000030, 0x00020015 },
+-    { 0x00000034, 0x00000005 },
+-    { 0x00000040, 0x00000000 },
+-    { 0x00000044, 0x00000008 },
+-    { 0x00000048, 0x00000008 },
+-    { 0x0000004c, 0x00000010 },
+-    { 0x00000050, 0x00000000 },
+-    { 0x00000054, 0x0000001f },
+-    { 0x00000800, 0x00000000 },
+-    { 0x00000804, 0x00000000 },
+-    { 0x00000808, 0x00000000 },
+-    { 0x0000080c, 0x00000000 },
+-    { 0x00000810, 0x00000000 },
+-    { 0x00000814, 0x00000000 },
+-    { 0x00000818, 0x00000000 },
+-    { 0x0000081c, 0x00000000 },
+-    { 0x00000820, 0x00000000 },
+-    { 0x00000824, 0x00000000 },
+-    { 0x00001040, 0x002ffc0f },
+-    { 0x00001044, 0x002ffc0f },
+-    { 0x00001048, 0x002ffc0f },
+-    { 0x0000104c, 0x002ffc0f },
+-    { 0x00001050, 0x002ffc0f },
+-    { 0x00001054, 0x002ffc0f },
+-    { 0x00001058, 0x002ffc0f },
+-    { 0x0000105c, 0x002ffc0f },
+-    { 0x00001060, 0x002ffc0f },
+-    { 0x00001064, 0x002ffc0f },
+-    { 0x00001230, 0x00000000 },
+-    { 0x00001270, 0x00000000 },
+-    { 0x00001038, 0x00000000 },
+-    { 0x00001078, 0x00000000 },
+-    { 0x000010b8, 0x00000000 },
+-    { 0x000010f8, 0x00000000 },
+-    { 0x00001138, 0x00000000 },
+-    { 0x00001178, 0x00000000 },
+-    { 0x000011b8, 0x00000000 },
+-    { 0x000011f8, 0x00000000 },
+-    { 0x00001238, 0x00000000 },
+-    { 0x00001278, 0x00000000 },
+-    { 0x000012b8, 0x00000000 },
+-    { 0x000012f8, 0x00000000 },
+-    { 0x00001338, 0x00000000 },
+-    { 0x00001378, 0x00000000 },
+-    { 0x000013b8, 0x00000000 },
+-    { 0x000013f8, 0x00000000 },
+-    { 0x00001438, 0x00000000 },
+-    { 0x00001478, 0x00000000 },
+-    { 0x000014b8, 0x00000000 },
+-    { 0x000014f8, 0x00000000 },
+-    { 0x00001538, 0x00000000 },
+-    { 0x00001578, 0x00000000 },
+-    { 0x000015b8, 0x00000000 },
+-    { 0x000015f8, 0x00000000 },
+-    { 0x00001638, 0x00000000 },
+-    { 0x00001678, 0x00000000 },
+-    { 0x000016b8, 0x00000000 },
+-    { 0x000016f8, 0x00000000 },
+-    { 0x00001738, 0x00000000 },
+-    { 0x00001778, 0x00000000 },
+-    { 0x000017b8, 0x00000000 },
+-    { 0x000017f8, 0x00000000 },
+-    { 0x0000103c, 0x00000000 },
+-    { 0x0000107c, 0x00000000 },
+-    { 0x000010bc, 0x00000000 },
+-    { 0x000010fc, 0x00000000 },
+-    { 0x0000113c, 0x00000000 },
+-    { 0x0000117c, 0x00000000 },
+-    { 0x000011bc, 0x00000000 },
+-    { 0x000011fc, 0x00000000 },
+-    { 0x0000123c, 0x00000000 },
+-    { 0x0000127c, 0x00000000 },
+-    { 0x000012bc, 0x00000000 },
+-    { 0x000012fc, 0x00000000 },
+-    { 0x0000133c, 0x00000000 },
+-    { 0x0000137c, 0x00000000 },
+-    { 0x000013bc, 0x00000000 },
+-    { 0x000013fc, 0x00000000 },
+-    { 0x0000143c, 0x00000000 },
+-    { 0x0000147c, 0x00000000 },
+-    { 0x00004030, 0x00000002 },
+-    { 0x0000403c, 0x00000002 },
+-    { 0x00004024, 0x0000001f },
+-    { 0x00004060, 0x00000000 },
+-    { 0x00004064, 0x00000000 },
+-    { 0x00007010, 0x00000033 },
+-    { 0x00007034, 0x00000002 },
+-    { 0x00007038, 0x000004c2 },
+-    { 0x00008004, 0x00000000 },
+-    { 0x00008008, 0x00000000 },
+-    { 0x0000800c, 0x00000000 },
+-    { 0x00008018, 0x00000700 },
+-    { 0x00008020, 0x00000000 },
+-    { 0x00008038, 0x00000000 },
+-    { 0x0000803c, 0x00000000 },
+-    { 0x00008048, 0x40000000 },
+-    { 0x00008054, 0x00000000 },
+-    { 0x00008058, 0x00000000 },
+-    { 0x0000805c, 0x000fc78f },
+-    { 0x00008060, 0x0000000f },
+-    { 0x00008064, 0x00000000 },
+-    { 0x00008070, 0x00000000 },
+-    { 0x000080c0, 0x2a80001a },
+-    { 0x000080c4, 0x05dc01e0 },
+-    { 0x000080c8, 0x1f402710 },
+-    { 0x000080cc, 0x01f40000 },
+-    { 0x000080d0, 0x00001e00 },
+-    { 0x000080d4, 0x00000000 },
+-    { 0x000080d8, 0x00400000 },
+-    { 0x000080e0, 0xffffffff },
+-    { 0x000080e4, 0x0000ffff },
+-    { 0x000080e8, 0x003f3f3f },
+-    { 0x000080ec, 0x00000000 },
+-    { 0x000080f0, 0x00000000 },
+-    { 0x000080f4, 0x00000000 },
+-    { 0x000080f8, 0x00000000 },
+-    { 0x000080fc, 0x00020000 },
+-    { 0x00008100, 0x00020000 },
+-    { 0x00008104, 0x00000001 },
+-    { 0x00008108, 0x00000052 },
+-    { 0x0000810c, 0x00000000 },
+-    { 0x00008110, 0x00000168 },
+-    { 0x00008118, 0x000100aa },
+-    { 0x0000811c, 0x00003210 },
+-    { 0x00008124, 0x00000000 },
+-    { 0x00008128, 0x00000000 },
+-    { 0x0000812c, 0x00000000 },
+-    { 0x00008130, 0x00000000 },
+-    { 0x00008134, 0x00000000 },
+-    { 0x00008138, 0x00000000 },
+-    { 0x0000813c, 0x00000000 },
+-    { 0x00008144, 0xffffffff },
+-    { 0x00008168, 0x00000000 },
+-    { 0x0000816c, 0x00000000 },
+-    { 0x00008170, 0x32143320 },
+-    { 0x00008174, 0xfaa4fa50 },
+-    { 0x00008178, 0x00000100 },
+-    { 0x0000817c, 0x00000000 },
+-    { 0x000081c0, 0x00000000 },
+-    { 0x000081ec, 0x00000000 },
+-    { 0x000081f0, 0x00000000 },
+-    { 0x000081f4, 0x00000000 },
+-    { 0x000081f8, 0x00000000 },
+-    { 0x000081fc, 0x00000000 },
+-    { 0x00008200, 0x00000000 },
+-    { 0x00008204, 0x00000000 },
+-    { 0x00008208, 0x00000000 },
+-    { 0x0000820c, 0x00000000 },
+-    { 0x00008210, 0x00000000 },
+-    { 0x00008214, 0x00000000 },
+-    { 0x00008218, 0x00000000 },
+-    { 0x0000821c, 0x00000000 },
+-    { 0x00008220, 0x00000000 },
+-    { 0x00008224, 0x00000000 },
+-    { 0x00008228, 0x00000000 },
+-    { 0x0000822c, 0x00000000 },
+-    { 0x00008230, 0x00000000 },
+-    { 0x00008234, 0x00000000 },
+-    { 0x00008238, 0x00000000 },
+-    { 0x0000823c, 0x00000000 },
+-    { 0x00008240, 0x00100000 },
+-    { 0x00008244, 0x0010f400 },
+-    { 0x00008248, 0x00000100 },
+-    { 0x0000824c, 0x0001e800 },
+-    { 0x00008250, 0x00000000 },
+-    { 0x00008254, 0x00000000 },
+-    { 0x00008258, 0x00000000 },
+-    { 0x0000825c, 0x400000ff },
+-    { 0x00008260, 0x00080922 },
+-    { 0x00008264, 0x88a00010 },
+-    { 0x00008270, 0x00000000 },
+-    { 0x00008274, 0x40000000 },
+-    { 0x00008278, 0x003e4180 },
+-    { 0x0000827c, 0x00000000 },
+-    { 0x00008284, 0x0000002c },
+-    { 0x00008288, 0x0000002c },
+-    { 0x0000828c, 0x00000000 },
+-    { 0x00008294, 0x00000000 },
+-    { 0x00008298, 0x00000000 },
+-    { 0x0000829c, 0x00000000 },
+-    { 0x00008300, 0x00000040 },
+-    { 0x00008314, 0x00000000 },
+-    { 0x00008328, 0x00000000 },
+-    { 0x0000832c, 0x00000007 },
+-    { 0x00008330, 0x00000302 },
+-    { 0x00008334, 0x00000e00 },
+-    { 0x00008338, 0x00ff0000 },
+-    { 0x0000833c, 0x00000000 },
+-    { 0x00008340, 0x000107ff },
+-    { 0x00008344, 0x00481043 },
+-    { 0x00009808, 0x00000000 },
+-    { 0x0000980c, 0xafa68e30 },
+-    { 0x00009810, 0xfd14e000 },
+-    { 0x00009814, 0x9c0a9f6b },
+-    { 0x0000981c, 0x00000000 },
+-    { 0x0000982c, 0x0000a000 },
+-    { 0x00009830, 0x00000000 },
+-    { 0x0000983c, 0x00200400 },
+-    { 0x0000984c, 0x0040233c },
+-    { 0x0000a84c, 0x0040233c },
+-    { 0x00009854, 0x00000044 },
+-    { 0x00009900, 0x00000000 },
+-    { 0x00009904, 0x00000000 },
+-    { 0x00009908, 0x00000000 },
+-    { 0x0000990c, 0x00000000 },
+-    { 0x00009910, 0x01002310 },
+-    { 0x0000991c, 0x10000fff },
+-    { 0x00009920, 0x04900000 },
+-    { 0x0000a920, 0x04900000 },
+-    { 0x00009928, 0x00000001 },
+-    { 0x0000992c, 0x00000004 },
+-    { 0x00009934, 0x1e1f2022 },
+-    { 0x00009938, 0x0a0b0c0d },
+-    { 0x0000993c, 0x00000000 },
+-    { 0x00009948, 0x9280c00a },
+-    { 0x0000994c, 0x00020028 },
+-    { 0x00009954, 0x5f3ca3de },
+-    { 0x00009958, 0x2108ecff },
+-    { 0x00009940, 0x14750604 },
+-    { 0x0000c95c, 0x004b6a8e },
+-    { 0x00009970, 0x190fb515 },
+-    { 0x00009974, 0x00000000 },
+-    { 0x00009978, 0x00000001 },
+-    { 0x0000997c, 0x00000000 },
+-    { 0x00009980, 0x00000000 },
+-    { 0x00009984, 0x00000000 },
+-    { 0x00009988, 0x00000000 },
+-    { 0x0000998c, 0x00000000 },
+-    { 0x00009990, 0x00000000 },
+-    { 0x00009994, 0x00000000 },
+-    { 0x00009998, 0x00000000 },
+-    { 0x0000999c, 0x00000000 },
+-    { 0x000099a0, 0x00000000 },
+-    { 0x000099a4, 0x00000001 },
+-    { 0x000099a8, 0x201fff00 },
+-    { 0x000099ac, 0x006f0000 },
+-    { 0x000099b0, 0x03051000 },
+-    { 0x000099b4, 0x00000820 },
+-    { 0x000099dc, 0x00000000 },
+-    { 0x000099e0, 0x00000000 },
+-    { 0x000099e4, 0xaaaaaaaa },
+-    { 0x000099e8, 0x3c466478 },
+-    { 0x000099ec, 0x0cc80caa },
+-    { 0x000099f0, 0x00000000 },
+-    { 0x000099fc, 0x00001042 },
+-    { 0x0000a208, 0x803e4788 },
+-    { 0x0000a210, 0x4080a333 },
+-    { 0x0000a214, 0x40206c10 },
+-    { 0x0000a218, 0x009c4060 },
+-    { 0x0000a220, 0x01834061 },
+-    { 0x0000a224, 0x00000400 },
+-    { 0x0000a228, 0x000003b5 },
+-    { 0x0000a22c, 0x233f7180 },
+-    { 0x0000a234, 0x20202020 },
+-    { 0x0000a238, 0x20202020 },
+-    { 0x0000a240, 0x38490a20 },
+-    { 0x0000a244, 0x00007bb6 },
+-    { 0x0000a248, 0x0fff3ffc },
+-    { 0x0000a24c, 0x00000000 },
+-    { 0x0000a254, 0x00000000 },
+-    { 0x0000a258, 0x0cdbd380 },
+-    { 0x0000a25c, 0x0f0f0f01 },
+-    { 0x0000a260, 0xdfa91f01 },
+-    { 0x0000a268, 0x00000000 },
+-    { 0x0000a26c, 0x0e79e5c6 },
+-    { 0x0000b26c, 0x0e79e5c6 },
+-    { 0x0000d270, 0x00820820 },
+-    { 0x0000a278, 0x1ce739ce },
+-    { 0x0000d35c, 0x07ffffef },
+-    { 0x0000d360, 0x0fffffe7 },
+-    { 0x0000d364, 0x17ffffe5 },
+-    { 0x0000d368, 0x1fffffe4 },
+-    { 0x0000d36c, 0x37ffffe3 },
+-    { 0x0000d370, 0x3fffffe3 },
+-    { 0x0000d374, 0x57ffffe3 },
+-    { 0x0000d378, 0x5fffffe2 },
+-    { 0x0000d37c, 0x7fffffe2 },
+-    { 0x0000d380, 0x7f3c7bba },
+-    { 0x0000d384, 0xf3307ff0 },
+-    { 0x0000a38c, 0x20202020 },
+-    { 0x0000a390, 0x20202020 },
+-    { 0x0000a394, 0x1ce739ce },
+-    { 0x0000a398, 0x000001ce },
+-    { 0x0000a39c, 0x00000001 },
+-    { 0x0000a3a0, 0x00000000 },
+-    { 0x0000a3a4, 0x00000000 },
+-    { 0x0000a3a8, 0x00000000 },
+-    { 0x0000a3ac, 0x00000000 },
+-    { 0x0000a3b0, 0x00000000 },
+-    { 0x0000a3b4, 0x00000000 },
+-    { 0x0000a3b8, 0x00000000 },
+-    { 0x0000a3bc, 0x00000000 },
+-    { 0x0000a3c0, 0x00000000 },
+-    { 0x0000a3c4, 0x00000000 },
+-    { 0x0000a3c8, 0x00000246 },
+-    { 0x0000a3cc, 0x20202020 },
+-    { 0x0000a3d0, 0x20202020 },
+-    { 0x0000a3d4, 0x20202020 },
+-    { 0x0000a3dc, 0x1ce739ce },
+-    { 0x0000a3e0, 0x000001ce },
+-    { 0x0000a3e4, 0x00000000 },
+-    { 0x0000a3e8, 0x18c43433 },
+-    { 0x0000a3ec, 0x00f70081 },
+-    { 0x00007800, 0x00040000 },
+-    { 0x00007804, 0xdb005012 },
+-    { 0x00007808, 0x04924914 },
+-    { 0x0000780c, 0x21084210 },
+-    { 0x00007810, 0x6d801300 },
+-    { 0x00007818, 0x07e41000 },
+-    { 0x00007824, 0x00040000 },
+-    { 0x00007828, 0xdb005012 },
+-    { 0x0000782c, 0x04924914 },
+-    { 0x00007830, 0x21084210 },
+-    { 0x00007834, 0x6d801300 },
+-    { 0x0000783c, 0x07e40000 },
+-    { 0x00007848, 0x00100000 },
+-    { 0x0000784c, 0x773f0567 },
+-    { 0x00007850, 0x54214514 },
+-    { 0x00007854, 0x12035828 },
+-    { 0x00007858, 0x9259269a },
+-    { 0x00007860, 0x52802000 },
+-    { 0x00007864, 0x0a8e370e },
+-    { 0x00007868, 0xc0102850 },
+-    { 0x0000786c, 0x812d4000 },
+-    { 0x00007870, 0x807ec400 },
+-    { 0x00007874, 0x001b6db0 },
+-    { 0x00007878, 0x00376b63 },
+-    { 0x0000787c, 0x06db6db6 },
+-    { 0x00007880, 0x006d8000 },
+-    { 0x00007884, 0xffeffffe },
+-    { 0x00007888, 0xffeffffe },
+-    { 0x0000788c, 0x00010000 },
+-    { 0x00007890, 0x02060aeb },
+-    { 0x00007898, 0x2a850160 },
++      /* Addr      allmodes  */
++      {0x0000000c, 0x00000000},
++      {0x00000030, 0x00020015},
++      {0x00000034, 0x00000005},
++      {0x00000040, 0x00000000},
++      {0x00000044, 0x00000008},
++      {0x00000048, 0x00000008},
++      {0x0000004c, 0x00000010},
++      {0x00000050, 0x00000000},
++      {0x00000054, 0x0000001f},
++      {0x00000800, 0x00000000},
++      {0x00000804, 0x00000000},
++      {0x00000808, 0x00000000},
++      {0x0000080c, 0x00000000},
++      {0x00000810, 0x00000000},
++      {0x00000814, 0x00000000},
++      {0x00000818, 0x00000000},
++      {0x0000081c, 0x00000000},
++      {0x00000820, 0x00000000},
++      {0x00000824, 0x00000000},
++      {0x00001040, 0x002ffc0f},
++      {0x00001044, 0x002ffc0f},
++      {0x00001048, 0x002ffc0f},
++      {0x0000104c, 0x002ffc0f},
++      {0x00001050, 0x002ffc0f},
++      {0x00001054, 0x002ffc0f},
++      {0x00001058, 0x002ffc0f},
++      {0x0000105c, 0x002ffc0f},
++      {0x00001060, 0x002ffc0f},
++      {0x00001064, 0x002ffc0f},
++      {0x00001230, 0x00000000},
++      {0x00001270, 0x00000000},
++      {0x00001038, 0x00000000},
++      {0x00001078, 0x00000000},
++      {0x000010b8, 0x00000000},
++      {0x000010f8, 0x00000000},
++      {0x00001138, 0x00000000},
++      {0x00001178, 0x00000000},
++      {0x000011b8, 0x00000000},
++      {0x000011f8, 0x00000000},
++      {0x00001238, 0x00000000},
++      {0x00001278, 0x00000000},
++      {0x000012b8, 0x00000000},
++      {0x000012f8, 0x00000000},
++      {0x00001338, 0x00000000},
++      {0x00001378, 0x00000000},
++      {0x000013b8, 0x00000000},
++      {0x000013f8, 0x00000000},
++      {0x00001438, 0x00000000},
++      {0x00001478, 0x00000000},
++      {0x000014b8, 0x00000000},
++      {0x000014f8, 0x00000000},
++      {0x00001538, 0x00000000},
++      {0x00001578, 0x00000000},
++      {0x000015b8, 0x00000000},
++      {0x000015f8, 0x00000000},
++      {0x00001638, 0x00000000},
++      {0x00001678, 0x00000000},
++      {0x000016b8, 0x00000000},
++      {0x000016f8, 0x00000000},
++      {0x00001738, 0x00000000},
++      {0x00001778, 0x00000000},
++      {0x000017b8, 0x00000000},
++      {0x000017f8, 0x00000000},
++      {0x0000103c, 0x00000000},
++      {0x0000107c, 0x00000000},
++      {0x000010bc, 0x00000000},
++      {0x000010fc, 0x00000000},
++      {0x0000113c, 0x00000000},
++      {0x0000117c, 0x00000000},
++      {0x000011bc, 0x00000000},
++      {0x000011fc, 0x00000000},
++      {0x0000123c, 0x00000000},
++      {0x0000127c, 0x00000000},
++      {0x000012bc, 0x00000000},
++      {0x000012fc, 0x00000000},
++      {0x0000133c, 0x00000000},
++      {0x0000137c, 0x00000000},
++      {0x000013bc, 0x00000000},
++      {0x000013fc, 0x00000000},
++      {0x0000143c, 0x00000000},
++      {0x0000147c, 0x00000000},
++      {0x00004030, 0x00000002},
++      {0x0000403c, 0x00000002},
++      {0x00004024, 0x0000001f},
++      {0x00004060, 0x00000000},
++      {0x00004064, 0x00000000},
++      {0x00007010, 0x00000033},
++      {0x00007034, 0x00000002},
++      {0x00007038, 0x000004c2},
++      {0x00008004, 0x00000000},
++      {0x00008008, 0x00000000},
++      {0x0000800c, 0x00000000},
++      {0x00008018, 0x00000700},
++      {0x00008020, 0x00000000},
++      {0x00008038, 0x00000000},
++      {0x0000803c, 0x00000000},
++      {0x00008048, 0x40000000},
++      {0x00008054, 0x00000000},
++      {0x00008058, 0x00000000},
++      {0x0000805c, 0x000fc78f},
++      {0x00008060, 0x0000000f},
++      {0x00008064, 0x00000000},
++      {0x00008070, 0x00000000},
++      {0x000080c0, 0x2a80001a},
++      {0x000080c4, 0x05dc01e0},
++      {0x000080c8, 0x1f402710},
++      {0x000080cc, 0x01f40000},
++      {0x000080d0, 0x00001e00},
++      {0x000080d4, 0x00000000},
++      {0x000080d8, 0x00400000},
++      {0x000080e0, 0xffffffff},
++      {0x000080e4, 0x0000ffff},
++      {0x000080e8, 0x003f3f3f},
++      {0x000080ec, 0x00000000},
++      {0x000080f0, 0x00000000},
++      {0x000080f4, 0x00000000},
++      {0x000080f8, 0x00000000},
++      {0x000080fc, 0x00020000},
++      {0x00008100, 0x00020000},
++      {0x00008104, 0x00000001},
++      {0x00008108, 0x00000052},
++      {0x0000810c, 0x00000000},
++      {0x00008110, 0x00000168},
++      {0x00008118, 0x000100aa},
++      {0x0000811c, 0x00003210},
++      {0x00008124, 0x00000000},
++      {0x00008128, 0x00000000},
++      {0x0000812c, 0x00000000},
++      {0x00008130, 0x00000000},
++      {0x00008134, 0x00000000},
++      {0x00008138, 0x00000000},
++      {0x0000813c, 0x00000000},
++      {0x00008144, 0xffffffff},
++      {0x00008168, 0x00000000},
++      {0x0000816c, 0x00000000},
++      {0x00008170, 0x32143320},
++      {0x00008174, 0xfaa4fa50},
++      {0x00008178, 0x00000100},
++      {0x0000817c, 0x00000000},
++      {0x000081c0, 0x00000000},
++      {0x000081ec, 0x00000000},
++      {0x000081f0, 0x00000000},
++      {0x000081f4, 0x00000000},
++      {0x000081f8, 0x00000000},
++      {0x000081fc, 0x00000000},
++      {0x00008200, 0x00000000},
++      {0x00008204, 0x00000000},
++      {0x00008208, 0x00000000},
++      {0x0000820c, 0x00000000},
++      {0x00008210, 0x00000000},
++      {0x00008214, 0x00000000},
++      {0x00008218, 0x00000000},
++      {0x0000821c, 0x00000000},
++      {0x00008220, 0x00000000},
++      {0x00008224, 0x00000000},
++      {0x00008228, 0x00000000},
++      {0x0000822c, 0x00000000},
++      {0x00008230, 0x00000000},
++      {0x00008234, 0x00000000},
++      {0x00008238, 0x00000000},
++      {0x0000823c, 0x00000000},
++      {0x00008240, 0x00100000},
++      {0x00008244, 0x0010f400},
++      {0x00008248, 0x00000100},
++      {0x0000824c, 0x0001e800},
++      {0x00008250, 0x00000000},
++      {0x00008254, 0x00000000},
++      {0x00008258, 0x00000000},
++      {0x0000825c, 0x400000ff},
++      {0x00008260, 0x00080922},
++      {0x00008264, 0x88a00010},
++      {0x00008270, 0x00000000},
++      {0x00008274, 0x40000000},
++      {0x00008278, 0x003e4180},
++      {0x0000827c, 0x00000000},
++      {0x00008284, 0x0000002c},
++      {0x00008288, 0x0000002c},
++      {0x0000828c, 0x00000000},
++      {0x00008294, 0x00000000},
++      {0x00008298, 0x00000000},
++      {0x0000829c, 0x00000000},
++      {0x00008300, 0x00000040},
++      {0x00008314, 0x00000000},
++      {0x00008328, 0x00000000},
++      {0x0000832c, 0x00000007},
++      {0x00008330, 0x00000302},
++      {0x00008334, 0x00000e00},
++      {0x00008338, 0x00ff0000},
++      {0x0000833c, 0x00000000},
++      {0x00008340, 0x000107ff},
++      {0x00008344, 0x00481043},
++      {0x00009808, 0x00000000},
++      {0x0000980c, 0xafa68e30},
++      {0x00009810, 0xfd14e000},
++      {0x00009814, 0x9c0a9f6b},
++      {0x0000981c, 0x00000000},
++      {0x0000982c, 0x0000a000},
++      {0x00009830, 0x00000000},
++      {0x0000983c, 0x00200400},
++      {0x0000984c, 0x0040233c},
++      {0x0000a84c, 0x0040233c},
++      {0x00009854, 0x00000044},
++      {0x00009900, 0x00000000},
++      {0x00009904, 0x00000000},
++      {0x00009908, 0x00000000},
++      {0x0000990c, 0x00000000},
++      {0x00009910, 0x01002310},
++      {0x0000991c, 0x10000fff},
++      {0x00009920, 0x04900000},
++      {0x0000a920, 0x04900000},
++      {0x00009928, 0x00000001},
++      {0x0000992c, 0x00000004},
++      {0x00009934, 0x1e1f2022},
++      {0x00009938, 0x0a0b0c0d},
++      {0x0000993c, 0x00000000},
++      {0x00009948, 0x9280c00a},
++      {0x0000994c, 0x00020028},
++      {0x00009954, 0x5f3ca3de},
++      {0x00009958, 0x2108ecff},
++      {0x00009940, 0x14750604},
++      {0x0000c95c, 0x004b6a8e},
++      {0x00009970, 0x190fb515},
++      {0x00009974, 0x00000000},
++      {0x00009978, 0x00000001},
++      {0x0000997c, 0x00000000},
++      {0x00009980, 0x00000000},
++      {0x00009984, 0x00000000},
++      {0x00009988, 0x00000000},
++      {0x0000998c, 0x00000000},
++      {0x00009990, 0x00000000},
++      {0x00009994, 0x00000000},
++      {0x00009998, 0x00000000},
++      {0x0000999c, 0x00000000},
++      {0x000099a0, 0x00000000},
++      {0x000099a4, 0x00000001},
++      {0x000099a8, 0x201fff00},
++      {0x000099ac, 0x006f0000},
++      {0x000099b0, 0x03051000},
++      {0x000099b4, 0x00000820},
++      {0x000099dc, 0x00000000},
++      {0x000099e0, 0x00000000},
++      {0x000099e4, 0xaaaaaaaa},
++      {0x000099e8, 0x3c466478},
++      {0x000099ec, 0x0cc80caa},
++      {0x000099f0, 0x00000000},
++      {0x000099fc, 0x00001042},
++      {0x0000a208, 0x803e4788},
++      {0x0000a210, 0x4080a333},
++      {0x0000a214, 0x40206c10},
++      {0x0000a218, 0x009c4060},
++      {0x0000a220, 0x01834061},
++      {0x0000a224, 0x00000400},
++      {0x0000a228, 0x000003b5},
++      {0x0000a22c, 0x233f7180},
++      {0x0000a234, 0x20202020},
++      {0x0000a238, 0x20202020},
++      {0x0000a240, 0x38490a20},
++      {0x0000a244, 0x00007bb6},
++      {0x0000a248, 0x0fff3ffc},
++      {0x0000a24c, 0x00000000},
++      {0x0000a254, 0x00000000},
++      {0x0000a258, 0x0cdbd380},
++      {0x0000a25c, 0x0f0f0f01},
++      {0x0000a260, 0xdfa91f01},
++      {0x0000a268, 0x00000000},
++      {0x0000a26c, 0x0e79e5c6},
++      {0x0000b26c, 0x0e79e5c6},
++      {0x0000d270, 0x00820820},
++      {0x0000a278, 0x1ce739ce},
++      {0x0000d35c, 0x07ffffef},
++      {0x0000d360, 0x0fffffe7},
++      {0x0000d364, 0x17ffffe5},
++      {0x0000d368, 0x1fffffe4},
++      {0x0000d36c, 0x37ffffe3},
++      {0x0000d370, 0x3fffffe3},
++      {0x0000d374, 0x57ffffe3},
++      {0x0000d378, 0x5fffffe2},
++      {0x0000d37c, 0x7fffffe2},
++      {0x0000d380, 0x7f3c7bba},
++      {0x0000d384, 0xf3307ff0},
++      {0x0000a38c, 0x20202020},
++      {0x0000a390, 0x20202020},
++      {0x0000a394, 0x1ce739ce},
++      {0x0000a398, 0x000001ce},
++      {0x0000a39c, 0x00000001},
++      {0x0000a3a0, 0x00000000},
++      {0x0000a3a4, 0x00000000},
++      {0x0000a3a8, 0x00000000},
++      {0x0000a3ac, 0x00000000},
++      {0x0000a3b0, 0x00000000},
++      {0x0000a3b4, 0x00000000},
++      {0x0000a3b8, 0x00000000},
++      {0x0000a3bc, 0x00000000},
++      {0x0000a3c0, 0x00000000},
++      {0x0000a3c4, 0x00000000},
++      {0x0000a3c8, 0x00000246},
++      {0x0000a3cc, 0x20202020},
++      {0x0000a3d0, 0x20202020},
++      {0x0000a3d4, 0x20202020},
++      {0x0000a3dc, 0x1ce739ce},
++      {0x0000a3e0, 0x000001ce},
++      {0x0000a3e4, 0x00000000},
++      {0x0000a3e8, 0x18c43433},
++      {0x0000a3ec, 0x00f70081},
++      {0x00007800, 0x00040000},
++      {0x00007804, 0xdb005012},
++      {0x00007808, 0x04924914},
++      {0x0000780c, 0x21084210},
++      {0x00007810, 0x6d801300},
++      {0x00007818, 0x07e41000},
++      {0x00007824, 0x00040000},
++      {0x00007828, 0xdb005012},
++      {0x0000782c, 0x04924914},
++      {0x00007830, 0x21084210},
++      {0x00007834, 0x6d801300},
++      {0x0000783c, 0x07e40000},
++      {0x00007848, 0x00100000},
++      {0x0000784c, 0x773f0567},
++      {0x00007850, 0x54214514},
++      {0x00007854, 0x12035828},
++      {0x00007858, 0x9259269a},
++      {0x00007860, 0x52802000},
++      {0x00007864, 0x0a8e370e},
++      {0x00007868, 0xc0102850},
++      {0x0000786c, 0x812d4000},
++      {0x00007870, 0x807ec400},
++      {0x00007874, 0x001b6db0},
++      {0x00007878, 0x00376b63},
++      {0x0000787c, 0x06db6db6},
++      {0x00007880, 0x006d8000},
++      {0x00007884, 0xffeffffe},
++      {0x00007888, 0xffeffffe},
++      {0x0000788c, 0x00010000},
++      {0x00007890, 0x02060aeb},
++      {0x00007898, 0x2a850160},
+ };
+ static const u32 ar9280Modes_fast_clock_9280_2[][3] = {
+-    { 0x00001030, 0x00000268, 0x000004d0 },
+-    { 0x00001070, 0x0000018c, 0x00000318 },
+-    { 0x000010b0, 0x00000fd0, 0x00001fa0 },
+-    { 0x00008014, 0x044c044c, 0x08980898 },
+-    { 0x0000801c, 0x148ec02b, 0x148ec057 },
+-    { 0x00008318, 0x000044c0, 0x00008980 },
+-    { 0x00009820, 0x02020200, 0x02020200 },
+-    { 0x00009824, 0x01000f0f, 0x01000f0f },
+-    { 0x00009828, 0x0b020001, 0x0b020001 },
+-    { 0x00009834, 0x00000f0f, 0x00000f0f },
+-    { 0x00009844, 0x03721821, 0x03721821 },
+-    { 0x00009914, 0x00000898, 0x00001130 },
+-    { 0x00009918, 0x0000000b, 0x00000016 },
++      /* Addr      5G_HT20     5G_HT40   */
++      {0x00001030, 0x00000268, 0x000004d0},
++      {0x00001070, 0x0000018c, 0x00000318},
++      {0x000010b0, 0x00000fd0, 0x00001fa0},
++      {0x00008014, 0x044c044c, 0x08980898},
++      {0x0000801c, 0x148ec02b, 0x148ec057},
++      {0x00008318, 0x000044c0, 0x00008980},
++      {0x00009820, 0x02020200, 0x02020200},
++      {0x00009824, 0x01000f0f, 0x01000f0f},
++      {0x00009828, 0x0b020001, 0x0b020001},
++      {0x00009834, 0x00000f0f, 0x00000f0f},
++      {0x00009844, 0x03721821, 0x03721821},
++      {0x00009914, 0x00000898, 0x00001130},
++      {0x00009918, 0x0000000b, 0x00000016},
+ };
+ static const u32 ar9280Modes_backoff_23db_rxgain_9280_2[][6] = {
+-    { 0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290 },
+-    { 0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300 },
+-    { 0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304 },
+-    { 0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308 },
+-    { 0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c },
+-    { 0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000 },
+-    { 0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004 },
+-    { 0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008 },
+-    { 0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c },
+-    { 0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080 },
+-    { 0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084 },
+-    { 0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088 },
+-    { 0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c },
+-    { 0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100 },
+-    { 0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104 },
+-    { 0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108 },
+-    { 0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c },
+-    { 0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110 },
+-    { 0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114 },
+-    { 0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180 },
+-    { 0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184 },
+-    { 0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188 },
+-    { 0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c },
+-    { 0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190 },
+-    { 0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194 },
+-    { 0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0 },
+-    { 0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c },
+-    { 0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8 },
+-    { 0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284 },
+-    { 0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288 },
+-    { 0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224 },
+-    { 0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290 },
+-    { 0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300 },
+-    { 0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304 },
+-    { 0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308 },
+-    { 0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c },
+-    { 0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380 },
+-    { 0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384 },
+-    { 0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700 },
+-    { 0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704 },
+-    { 0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708 },
+-    { 0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c },
+-    { 0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780 },
+-    { 0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784 },
+-    { 0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00 },
+-    { 0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04 },
+-    { 0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08 },
+-    { 0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c },
+-    { 0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b10, 0x00008b10, 0x00008b10 },
+-    { 0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b14, 0x00008b14, 0x00008b14 },
+-    { 0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b01, 0x00008b01, 0x00008b01 },
+-    { 0x00009acc, 0x0000b380, 0x0000b380, 0x00008b05, 0x00008b05, 0x00008b05 },
+-    { 0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b09, 0x00008b09, 0x00008b09 },
+-    { 0x00009ad4, 0x0000b388, 0x0000b388, 0x00008b0d, 0x00008b0d, 0x00008b0d },
+-    { 0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008b11, 0x00008b11, 0x00008b11 },
+-    { 0x00009adc, 0x0000b390, 0x0000b390, 0x00008b15, 0x00008b15, 0x00008b15 },
+-    { 0x00009ae0, 0x0000b394, 0x0000b394, 0x00008b02, 0x00008b02, 0x00008b02 },
+-    { 0x00009ae4, 0x0000b398, 0x0000b398, 0x00008b06, 0x00008b06, 0x00008b06 },
+-    { 0x00009ae8, 0x0000b780, 0x0000b780, 0x00008b0a, 0x00008b0a, 0x00008b0a },
+-    { 0x00009aec, 0x0000b784, 0x0000b784, 0x00008b0e, 0x00008b0e, 0x00008b0e },
+-    { 0x00009af0, 0x0000b788, 0x0000b788, 0x00008b12, 0x00008b12, 0x00008b12 },
+-    { 0x00009af4, 0x0000b78c, 0x0000b78c, 0x00008b16, 0x00008b16, 0x00008b16 },
+-    { 0x00009af8, 0x0000b790, 0x0000b790, 0x00008b03, 0x00008b03, 0x00008b03 },
+-    { 0x00009afc, 0x0000b794, 0x0000b794, 0x00008b07, 0x00008b07, 0x00008b07 },
+-    { 0x00009b00, 0x0000b798, 0x0000b798, 0x00008b0b, 0x00008b0b, 0x00008b0b },
+-    { 0x00009b04, 0x0000d784, 0x0000d784, 0x00008b0f, 0x00008b0f, 0x00008b0f },
+-    { 0x00009b08, 0x0000d788, 0x0000d788, 0x00008b13, 0x00008b13, 0x00008b13 },
+-    { 0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00008b17, 0x00008b17, 0x00008b17 },
+-    { 0x00009b10, 0x0000d790, 0x0000d790, 0x00008b23, 0x00008b23, 0x00008b23 },
+-    { 0x00009b14, 0x0000f780, 0x0000f780, 0x00008b27, 0x00008b27, 0x00008b27 },
+-    { 0x00009b18, 0x0000f784, 0x0000f784, 0x00008b2b, 0x00008b2b, 0x00008b2b },
+-    { 0x00009b1c, 0x0000f788, 0x0000f788, 0x00008b2f, 0x00008b2f, 0x00008b2f },
+-    { 0x00009b20, 0x0000f78c, 0x0000f78c, 0x00008b33, 0x00008b33, 0x00008b33 },
+-    { 0x00009b24, 0x0000f790, 0x0000f790, 0x00008b37, 0x00008b37, 0x00008b37 },
+-    { 0x00009b28, 0x0000f794, 0x0000f794, 0x00008b43, 0x00008b43, 0x00008b43 },
+-    { 0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x00008b47, 0x00008b47, 0x00008b47 },
+-    { 0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x00008b4b, 0x00008b4b, 0x00008b4b },
+-    { 0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x00008b4f, 0x00008b4f, 0x00008b4f },
+-    { 0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x00008b53, 0x00008b53, 0x00008b53 },
+-    { 0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x00008b57, 0x00008b57, 0x00008b57 },
+-    { 0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b98, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009b9c, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009ba0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009ba4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009ba8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bac, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bb0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bb4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bb8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bbc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bc0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bc4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bc8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bcc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bd0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bd4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bd8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bdc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009be0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009be4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009be8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bec, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bf0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bf4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bf8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009bfc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b },
+-    { 0x00009848, 0x00001066, 0x00001066, 0x00001050, 0x00001050, 0x00001050 },
+-    { 0x0000a848, 0x00001066, 0x00001066, 0x00001050, 0x00001050, 0x00001050 },
++      {0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290},
++      {0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300},
++      {0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304},
++      {0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308},
++      {0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c},
++      {0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000},
++      {0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004},
++      {0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008},
++      {0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c},
++      {0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080},
++      {0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084},
++      {0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088},
++      {0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c},
++      {0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100},
++      {0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104},
++      {0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108},
++      {0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c},
++      {0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110},
++      {0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114},
++      {0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180},
++      {0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184},
++      {0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188},
++      {0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c},
++      {0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190},
++      {0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194},
++      {0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0},
++      {0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c},
++      {0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8},
++      {0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284},
++      {0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288},
++      {0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224},
++      {0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290},
++      {0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300},
++      {0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304},
++      {0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308},
++      {0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c},
++      {0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380},
++      {0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384},
++      {0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700},
++      {0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704},
++      {0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708},
++      {0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c},
++      {0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780},
++      {0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784},
++      {0x00009ab0, 0x0000ab94, 0x0000ab94, 0x00008b00, 0x00008b00, 0x00008b00},
++      {0x00009ab4, 0x0000af80, 0x0000af80, 0x00008b04, 0x00008b04, 0x00008b04},
++      {0x00009ab8, 0x0000af84, 0x0000af84, 0x00008b08, 0x00008b08, 0x00008b08},
++      {0x00009abc, 0x0000af88, 0x0000af88, 0x00008b0c, 0x00008b0c, 0x00008b0c},
++      {0x00009ac0, 0x0000af8c, 0x0000af8c, 0x00008b10, 0x00008b10, 0x00008b10},
++      {0x00009ac4, 0x0000af90, 0x0000af90, 0x00008b14, 0x00008b14, 0x00008b14},
++      {0x00009ac8, 0x0000af94, 0x0000af94, 0x00008b01, 0x00008b01, 0x00008b01},
++      {0x00009acc, 0x0000b380, 0x0000b380, 0x00008b05, 0x00008b05, 0x00008b05},
++      {0x00009ad0, 0x0000b384, 0x0000b384, 0x00008b09, 0x00008b09, 0x00008b09},
++      {0x00009ad4, 0x0000b388, 0x0000b388, 0x00008b0d, 0x00008b0d, 0x00008b0d},
++      {0x00009ad8, 0x0000b38c, 0x0000b38c, 0x00008b11, 0x00008b11, 0x00008b11},
++      {0x00009adc, 0x0000b390, 0x0000b390, 0x00008b15, 0x00008b15, 0x00008b15},
++      {0x00009ae0, 0x0000b394, 0x0000b394, 0x00008b02, 0x00008b02, 0x00008b02},
++      {0x00009ae4, 0x0000b398, 0x0000b398, 0x00008b06, 0x00008b06, 0x00008b06},
++      {0x00009ae8, 0x0000b780, 0x0000b780, 0x00008b0a, 0x00008b0a, 0x00008b0a},
++      {0x00009aec, 0x0000b784, 0x0000b784, 0x00008b0e, 0x00008b0e, 0x00008b0e},
++      {0x00009af0, 0x0000b788, 0x0000b788, 0x00008b12, 0x00008b12, 0x00008b12},
++      {0x00009af4, 0x0000b78c, 0x0000b78c, 0x00008b16, 0x00008b16, 0x00008b16},
++      {0x00009af8, 0x0000b790, 0x0000b790, 0x00008b03, 0x00008b03, 0x00008b03},
++      {0x00009afc, 0x0000b794, 0x0000b794, 0x00008b07, 0x00008b07, 0x00008b07},
++      {0x00009b00, 0x0000b798, 0x0000b798, 0x00008b0b, 0x00008b0b, 0x00008b0b},
++      {0x00009b04, 0x0000d784, 0x0000d784, 0x00008b0f, 0x00008b0f, 0x00008b0f},
++      {0x00009b08, 0x0000d788, 0x0000d788, 0x00008b13, 0x00008b13, 0x00008b13},
++      {0x00009b0c, 0x0000d78c, 0x0000d78c, 0x00008b17, 0x00008b17, 0x00008b17},
++      {0x00009b10, 0x0000d790, 0x0000d790, 0x00008b23, 0x00008b23, 0x00008b23},
++      {0x00009b14, 0x0000f780, 0x0000f780, 0x00008b27, 0x00008b27, 0x00008b27},
++      {0x00009b18, 0x0000f784, 0x0000f784, 0x00008b2b, 0x00008b2b, 0x00008b2b},
++      {0x00009b1c, 0x0000f788, 0x0000f788, 0x00008b2f, 0x00008b2f, 0x00008b2f},
++      {0x00009b20, 0x0000f78c, 0x0000f78c, 0x00008b33, 0x00008b33, 0x00008b33},
++      {0x00009b24, 0x0000f790, 0x0000f790, 0x00008b37, 0x00008b37, 0x00008b37},
++      {0x00009b28, 0x0000f794, 0x0000f794, 0x00008b43, 0x00008b43, 0x00008b43},
++      {0x00009b2c, 0x0000f7a4, 0x0000f7a4, 0x00008b47, 0x00008b47, 0x00008b47},
++      {0x00009b30, 0x0000f7a8, 0x0000f7a8, 0x00008b4b, 0x00008b4b, 0x00008b4b},
++      {0x00009b34, 0x0000f7ac, 0x0000f7ac, 0x00008b4f, 0x00008b4f, 0x00008b4f},
++      {0x00009b38, 0x0000f7b0, 0x0000f7b0, 0x00008b53, 0x00008b53, 0x00008b53},
++      {0x00009b3c, 0x0000f7b4, 0x0000f7b4, 0x00008b57, 0x00008b57, 0x00008b57},
++      {0x00009b40, 0x0000f7a1, 0x0000f7a1, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b44, 0x0000f7a5, 0x0000f7a5, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b48, 0x0000f7a9, 0x0000f7a9, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b4c, 0x0000f7ad, 0x0000f7ad, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b50, 0x0000f7b1, 0x0000f7b1, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b54, 0x0000f7b5, 0x0000f7b5, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b58, 0x0000f7c5, 0x0000f7c5, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b5c, 0x0000f7c9, 0x0000f7c9, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b60, 0x0000f7cd, 0x0000f7cd, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b64, 0x0000f7d1, 0x0000f7d1, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b68, 0x0000f7d5, 0x0000f7d5, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b6c, 0x0000f7c2, 0x0000f7c2, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b70, 0x0000f7c6, 0x0000f7c6, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b74, 0x0000f7ca, 0x0000f7ca, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b78, 0x0000f7ce, 0x0000f7ce, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b7c, 0x0000f7d2, 0x0000f7d2, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b80, 0x0000f7d6, 0x0000f7d6, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b84, 0x0000f7c3, 0x0000f7c3, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b88, 0x0000f7c7, 0x0000f7c7, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b8c, 0x0000f7cb, 0x0000f7cb, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b90, 0x0000f7d3, 0x0000f7d3, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b94, 0x0000f7d7, 0x0000f7d7, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b98, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009b9c, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009ba0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009ba4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009ba8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bac, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bb0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bb4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bb8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bbc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bc0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bc4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bc8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bcc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bd0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bd4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bd8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bdc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009be0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009be4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009be8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bec, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bf0, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bf4, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bf8, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009bfc, 0x0000f7db, 0x0000f7db, 0x00008b5b, 0x00008b5b, 0x00008b5b},
++      {0x00009848, 0x00001066, 0x00001066, 0x00001050, 0x00001050, 0x00001050},
++      {0x0000a848, 0x00001066, 0x00001066, 0x00001050, 0x00001050, 0x00001050},
+ };
+ static const u32 ar9280Modes_original_rxgain_9280_2[][6] = {
+-    { 0x00009a00, 0x00008184, 0x00008184, 0x00000290, 0x00000290, 0x00000290 },
+-    { 0x00009a04, 0x00008188, 0x00008188, 0x00000300, 0x00000300, 0x00000300 },
+-    { 0x00009a08, 0x0000818c, 0x0000818c, 0x00000304, 0x00000304, 0x00000304 },
+-    { 0x00009a0c, 0x00008190, 0x00008190, 0x00000308, 0x00000308, 0x00000308 },
+-    { 0x00009a10, 0x00008194, 0x00008194, 0x0000030c, 0x0000030c, 0x0000030c },
+-    { 0x00009a14, 0x00008200, 0x00008200, 0x00008000, 0x00008000, 0x00008000 },
+-    { 0x00009a18, 0x00008204, 0x00008204, 0x00008004, 0x00008004, 0x00008004 },
+-    { 0x00009a1c, 0x00008208, 0x00008208, 0x00008008, 0x00008008, 0x00008008 },
+-    { 0x00009a20, 0x0000820c, 0x0000820c, 0x0000800c, 0x0000800c, 0x0000800c },
+-    { 0x00009a24, 0x00008210, 0x00008210, 0x00008080, 0x00008080, 0x00008080 },
+-    { 0x00009a28, 0x00008214, 0x00008214, 0x00008084, 0x00008084, 0x00008084 },
+-    { 0x00009a2c, 0x00008280, 0x00008280, 0x00008088, 0x00008088, 0x00008088 },
+-    { 0x00009a30, 0x00008284, 0x00008284, 0x0000808c, 0x0000808c, 0x0000808c },
+-    { 0x00009a34, 0x00008288, 0x00008288, 0x00008100, 0x00008100, 0x00008100 },
+-    { 0x00009a38, 0x0000828c, 0x0000828c, 0x00008104, 0x00008104, 0x00008104 },
+-    { 0x00009a3c, 0x00008290, 0x00008290, 0x00008108, 0x00008108, 0x00008108 },
+-    { 0x00009a40, 0x00008300, 0x00008300, 0x0000810c, 0x0000810c, 0x0000810c },
+-    { 0x00009a44, 0x00008304, 0x00008304, 0x00008110, 0x00008110, 0x00008110 },
+-    { 0x00009a48, 0x00008308, 0x00008308, 0x00008114, 0x00008114, 0x00008114 },
+-    { 0x00009a4c, 0x0000830c, 0x0000830c, 0x00008180, 0x00008180, 0x00008180 },
+-    { 0x00009a50, 0x00008310, 0x00008310, 0x00008184, 0x00008184, 0x00008184 },
+-    { 0x00009a54, 0x00008314, 0x00008314, 0x00008188, 0x00008188, 0x00008188 },
+-    { 0x00009a58, 0x00008380, 0x00008380, 0x0000818c, 0x0000818c, 0x0000818c },
+-    { 0x00009a5c, 0x00008384, 0x00008384, 0x00008190, 0x00008190, 0x00008190 },
+-    { 0x00009a60, 0x00008388, 0x00008388, 0x00008194, 0x00008194, 0x00008194 },
+-    { 0x00009a64, 0x0000838c, 0x0000838c, 0x000081a0, 0x000081a0, 0x000081a0 },
+-    { 0x00009a68, 0x00008390, 0x00008390, 0x0000820c, 0x0000820c, 0x0000820c },
+-    { 0x00009a6c, 0x00008394, 0x00008394, 0x000081a8, 0x000081a8, 0x000081a8 },
+-    { 0x00009a70, 0x0000a380, 0x0000a380, 0x00008284, 0x00008284, 0x00008284 },
+-    { 0x00009a74, 0x0000a384, 0x0000a384, 0x00008288, 0x00008288, 0x00008288 },
+-    { 0x00009a78, 0x0000a388, 0x0000a388, 0x00008224, 0x00008224, 0x00008224 },
+-    { 0x00009a7c, 0x0000a38c, 0x0000a38c, 0x00008290, 0x00008290, 0x00008290 },
+-    { 0x00009a80, 0x0000a390, 0x0000a390, 0x00008300, 0x00008300, 0x00008300 },
+-    { 0x00009a84, 0x0000a394, 0x0000a394, 0x00008304, 0x00008304, 0x00008304 },
+-    { 0x00009a88, 0x0000a780, 0x0000a780, 0x00008308, 0x00008308, 0x00008308 },
+-    { 0x00009a8c, 0x0000a784, 0x0000a784, 0x0000830c, 0x0000830c, 0x0000830c },
+-    { 0x00009a90, 0x0000a788, 0x0000a788, 0x00008380, 0x00008380, 0x00008380 },
+-    { 0x00009a94, 0x0000a78c, 0x0000a78c, 0x00008384, 0x00008384, 0x00008384 },
+-    { 0x00009a98, 0x0000a790, 0x0000a790, 0x00008700, 0x00008700, 0x00008700 },
+-    { 0x00009a9c, 0x0000a794, 0x0000a794, 0x00008704, 0x00008704, 0x00008704 },
+-    { 0x00009aa0, 0x0000ab84, 0x0000ab84, 0x00008708, 0x00008708, 0x00008708 },
+-    { 0x00009aa4, 0x0000ab88, 0x0000ab88, 0x0000870c, 0x0000870c, 0x0000870c },
+-    { 0x00009aa8, 0x0000ab8c, 0x0000ab8c, 0x00008780, 0x00008780, 0x00008780 },
+-    { 0x00009aac, 0x0000ab90, 0x0000ab90, 0x00008784, 0x00008784, 0x00008784 },
+-    {