From: damien <damien@openbsd.org>
Date: Thu, 15 Jul 2010 19:24:04 +0000 (+0000)
Subject: sync initialization values for AR9160 and AR9280 with ath9k.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=6af6bb5b56dbca0fd4395227cf7e35ef405e0615;p=openbsd

sync initialization values for AR9160 and AR9280 with ath9k.

see http://marc.info/?l=linux-wireless&m=127802223525594&w=2 for the
list of changes/fixes.
---

diff --git a/sys/dev/ic/ar5416reg.h b/sys/dev/ic/ar5416reg.h
index 13d0b84567e..763c3a40ba9 100644
--- a/sys/dev/ic/ar5416reg.h
+++ b/sys/dev/ic/ar5416reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5416reg.h,v 1.2 2010/05/10 17:44:21 damien Exp $	*/
+/*	$OpenBSD: ar5416reg.h,v 1.3 2010/07/15 19:24:04 damien Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -368,7 +368,7 @@ static const uint32_t ar5416_cm_vals[] = {
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00100000, 0x0010f400, 0x00000100, 0x0001e800,
 	0x00000000, 0x00000000, 0x00000000, 0x400000ff, 0x00080922,
-	0xa8000010, 0x00000000, 0x40000000, 0x003e4180, 0x00000000,
+	0x88000010, 0x00000000, 0x40000000, 0x003e4180, 0x00000000,
 	0x0000002c, 0x0000002c, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x00000302,
@@ -431,84 +431,84 @@ static const struct athn_ini ar5416_ini = {
  */
 static const uint16_t ar9160_regs[] = {
 	P(0x01030), P(0x01070), P(0x010b0), P(0x010f0), P(0x08014),
-	P(0x0801c), P(0x09804), P(0x09820), P(0x09824), P(0x09828),
-	P(0x09834), P(0x09838), P(0x09844), P(0x09848), P(0x0a848),
-	P(0x0b848), P(0x09850), P(0x09858), P(0x0985c), P(0x09860),
-	P(0x0c864), P(0x09868), P(0x0986c), P(0x09914), P(0x09918),
-	P(0x09924), P(0x09944), P(0x09960), P(0x0a960), P(0x0b960),
-	P(0x09964), P(0x0c968), P(0x0c9bc), P(0x099c0), P(0x099c4),
-	P(0x099c8), P(0x099cc), P(0x099d0), P(0x099d4), P(0x099d8),
-	P(0x0a204), P(0x0a208), P(0x0a20c), P(0x0b20c), P(0x0c20c),
-	P(0x0a21c), P(0x0a230), P(0x0a274), P(0x0a300), P(0x0a304),
-	P(0x0a308), P(0x0a30c), P(0x0a310), P(0x0a314), P(0x0a318),
-	P(0x0a31c), P(0x0a320), P(0x0a324), P(0x0a328), P(0x0a32c),
-	P(0x0a330), P(0x0a334)
+	P(0x0801c), P(0x08120), P(0x081d0), P(0x09804), P(0x09820),
+	P(0x09824), P(0x09828), P(0x09834), P(0x09838), P(0x09844),
+	P(0x09848), P(0x0a848), P(0x0b848), P(0x09850), P(0x09858),
+	P(0x0985c), P(0x09860), P(0x09864), P(0x09868), P(0x0986c),
+	P(0x09914), P(0x09918), P(0x09924), P(0x09944), P(0x09960),
+	P(0x0a960), P(0x0b960), P(0x09964), P(0x0c968), P(0x099bc),
+	P(0x099c0), P(0x099c4), P(0x099c8), P(0x099cc), P(0x099d0),
+	P(0x099d4), P(0x099d8), P(0x0a204), P(0x0a208), P(0x0a20c),
+	P(0x0b20c), P(0x0c20c), P(0x0a21c), P(0x0a230), P(0x0a274),
+	P(0x0a300), P(0x0a304), P(0x0a308), P(0x0a30c), P(0x0a310),
+	P(0x0a314), P(0x0a318), P(0x0a31c), P(0x0a320), P(0x0a324),
+	P(0x0a328), P(0x0a32c), P(0x0a330), P(0x0a334)
 };
 
 static const uint32_t ar9160_vals_5g20[] = {
 	0x00000230, 0x00000168, 0x00000e60, 0x0000a000, 0x03e803e8,
-	0x128d93a7, 0x00000300, 0x02020200, 0x00000e0e, 0x0a020001,
-	0x00000e0e, 0x00000007, 0x0372161e, 0x001a6a65, 0x001a6a65,
-	0x001a6a65, 0x6c48b4e2, 0x7ec82d2e, 0x31395d5e, 0x00048d18,
-	0x0001ce00, 0x409a40d0, 0x050cb081, 0x000007d0, 0x0000000a,
-	0xd00a8a07, 0xffb81020, 0x00009b40, 0x00009b40, 0x00009b40,
-	0x00001120, 0x000003b5, 0x001a0600, 0x038919be, 0x06336f77,
-	0x60f65329, 0x08f186c8, 0x00046384, 0x00000000, 0x00000000,
-	0x00000880, 0xd6be4788, 0x002fc160, 0x002fc160, 0x002fc160,
-	0x1883800a, 0x00000000, 0x0a1a9caa, 0x18010000, 0x30032602,
-	0x48073e06, 0x560b4c0a, 0x641a600f, 0x7a4f6e1b, 0x8c5b7e5a,
-	0x9d0f96cf, 0xb51fa69f, 0xcb3fbd07, 0x0000d7bf, 0x00000000,
-	0x00000000, 0x00000000
+	0x128d93a7, 0x08f04800, 0x00003210, 0x00000300, 0x02020200,
+	0x00000e0e, 0x0a020001, 0x00000e0e, 0x00000007, 0x0372161e,
+	0x001a6a65, 0x001a6a65, 0x001a6a65, 0x6c48b4e2, 0x7ec82d2e,
+	0x31395d5e, 0x00048d18, 0x0001ce00, 0x409a40d0, 0x050cb081,
+	0x000007d0, 0x0000000a, 0xd00a8a07, 0xffb81020, 0x00009b40,
+	0x00009b40, 0x00009b40, 0x00001120, 0x000003b5, 0x001a0600,
+	0x038919be, 0x06336f77, 0x6af65329, 0x08f186c8, 0x00046384,
+	0x00000000, 0x00000000, 0x00000880, 0xd6be4788, 0x002fc160,
+	0x002fc160, 0x002fc160, 0x1883800a, 0x00000000, 0x0a1a9caa,
+	0x18010000, 0x30032602, 0x48073e06, 0x560b4c0a, 0x641a600f,
+	0x7a4f6e1b, 0x8c5b7e5a, 0x9d0f96cf, 0xb51fa69f, 0xcb3fbd07,
+	0x0000d7bf, 0x00000000, 0x00000000, 0x00000000
 };
 
 #ifndef IEEE80211_NO_HT
 static const uint32_t ar9160_vals_5g40[] = {
 	0x00000460, 0x000002d0, 0x00001cc0, 0x00014000, 0x07d007d0,
-	0x128d93cf, 0x000003c4, 0x02020200, 0x00000e0e, 0x0a020001,
-	0x00000e0e, 0x00000007, 0x0372161e, 0x001a6a65, 0x001a6a65,
-	0x001a6a65, 0x6c48b4e2, 0x7ec82d2e, 0x31395d5e, 0x00048d18,
-	0x0001ce00, 0x409a40d0, 0x050cb081, 0x00000fa0, 0x00000014,
-	0xd00a8a07, 0xffb81020, 0x00009b40, 0x00009b40, 0x00009b40,
-	0x00001120, 0x000003b5, 0x001a0600, 0x038919be, 0x06336f77,
-	0x60f65329, 0x08f186c8, 0x00046384, 0x00000000, 0x00000000,
-	0x00000880, 0xd6be4788, 0x002fc160, 0x002fc160, 0x002fc160,
-	0x1883800a, 0x00000000, 0x0a1a9caa, 0x18010000, 0x30032602,
-	0x48073e06, 0x560b4c0a, 0x641a600f, 0x7a4f6e1b, 0x8c5b7e5a,
-	0x9d0f96cf, 0xb51fa69f, 0xcb3fbcbf, 0x0000d7bf, 0x00000000,
-	0x00000000, 0x00000000
+	0x128d93cf, 0x08f04800, 0x00003210, 0x000003c4, 0x02020200,
+	0x00000e0e, 0x0a020001, 0x00000e0e, 0x00000007, 0x0372161e,
+	0x001a6a65, 0x001a6a65, 0x001a6a65, 0x6d48b4e2, 0x7ec82d2e,
+	0x3139605e, 0x00048d18, 0x0001ce00, 0x409a40d0, 0x050cb081,
+	0x00000fa0, 0x00000014, 0xd00a8a07, 0xffb81020, 0x00009b40,
+	0x00009b40, 0x00009b40, 0x00001120, 0x000003b5, 0x001a0600,
+	0x038919be, 0x06336f77, 0x6af65329, 0x08f186c8, 0x00046384,
+	0x00000000, 0x00000000, 0x00000880, 0xd6be4788, 0x002fc160,
+	0x002fc160, 0x002fc160, 0x1883800a, 0x00000000, 0x0a1a9caa,
+	0x18010000, 0x30032602, 0x48073e06, 0x560b4c0a, 0x641a600f,
+	0x7a4f6e1b, 0x8c5b7e5a, 0x9d0f96cf, 0xb51fa69f, 0xcb3fbcbf,
+	0x0000d7bf, 0x00000000, 0x00000000, 0x00000000
 };
 
 static const uint32_t ar9160_vals_2g40[] = {
 	0x000002c0, 0x00000318, 0x00007c70, 0x00016000, 0x10801600,
-	0x12e013d7, 0x000003c4, 0x02020200, 0x00000e0e, 0x0a020001,
-	0x00000e0e, 0x00000007, 0x037216a0, 0x00197a68, 0x00197a68,
-	0x00197a68, 0x6c48b0e2, 0x7ec82d2e, 0x31395d5e, 0x00048d20,
-	0x0001ce00, 0x409a40d0, 0x050cb081, 0x00001130, 0x00000016,
-	0xd00a8a0d, 0xffb81020, 0x00009b40, 0x00009b40, 0x00009b40,
-	0x00001120, 0x000003ce, 0x001a0c00, 0x038919be, 0x06336f77,
-	0x60f65329, 0x08f186c8, 0x00046384, 0x00000000, 0x00000000,
-	0x00000880, 0xd03e4788, 0x002ac120, 0x002ac120, 0x002ac120,
-	0x1883800a, 0x00000210, 0x0a1a7caa, 0x18010000, 0x2e032402,
-	0x4a0a3c06, 0x621a540b, 0x764f6c1b, 0x845b7a5a, 0x950f8ccf,
-	0xa5cf9b4f, 0xbddfaf1f, 0xd1ffc93f, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000
+	0x12e013d7, 0x08f04810, 0x0000320a, 0x000003c4, 0x02020200,
+	0x00000e0e, 0x0a020001, 0x00000e0e, 0x00000007, 0x037216a0,
+	0x00197a68, 0x00197a68, 0x00197a68, 0x6d48b0e2, 0x7ec82d2e,
+	0x3139605e, 0x00048d20, 0x0001ce00, 0x409a40d0, 0x050cb081,
+	0x00001130, 0x00000016, 0xd00a8a0d, 0xffb81020, 0x00009b40,
+	0x00009b40, 0x00009b40, 0x00001120, 0x000003ce, 0x001a0c00,
+	0x038919be, 0x06336f77, 0x6af65329, 0x08f186c8, 0x00046384,
+	0x00000000, 0x00000000, 0x00000880, 0xd03e4788, 0x002ac120,
+	0x002ac120, 0x002ac120, 0x1883800a, 0x00000210, 0x0a1a7caa,
+	0x18010000, 0x2e032402, 0x4a0a3c06, 0x621a540b, 0x764f6c1b,
+	0x845b7a5a, 0x950f8ccf, 0xa5cf9b4f, 0xbddfaf1f, 0xd1ffc93f,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
 #endif
 
 static const uint32_t ar9160_vals_2g20[] = {
 	0x00000160, 0x0000018c, 0x00003e38, 0x0000b000, 0x08400b00,
-	0x12e013ab, 0x00000300, 0x02020200, 0x00000e0e, 0x0a020001,
-	0x00000e0e, 0x00000007, 0x037216a0, 0x00197a68, 0x00197a68,
-	0x00197a68, 0x6c48b0e2, 0x7ec82d2e, 0x31395d5e, 0x00048d20,
-	0x0001ce00, 0x409a40d0, 0x050cb081, 0x00000898, 0x0000000b,
-	0xd00a8a0d, 0xffb81020, 0x00009b40, 0x00009b40, 0x00009b40,
-	0x00001120, 0x000003ce, 0x001a0c00, 0x038919be, 0x06336f77,
-	0x60f65329, 0x08f186c8, 0x00046384, 0x00000000, 0x00000000,
-	0x00000880, 0xd03e4788, 0x002ac120, 0x002ac120, 0x002ac120,
-	0x1883800a, 0x00000108, 0x0a1a7caa, 0x18010000, 0x2e032402,
-	0x4a0a3c06, 0x621a540b, 0x764f6c1b, 0x845b7a5a, 0x950f8ccf,
-	0xa5cf9b4f, 0xbddfaf1f, 0xd1ffc93f, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000
+	0x12e013ab, 0x08f04810, 0x0000320a, 0x00000300, 0x02020200,
+	0x00000e0e, 0x0a020001, 0x00000e0e, 0x00000007, 0x037216a0,
+	0x00197a68, 0x00197a68, 0x00197a68, 0x6c48b0e2, 0x7ec82d2e,
+	0x31395d5e, 0x00048d20, 0x0001ce00, 0x409a40d0, 0x050cb081,
+	0x00000898, 0x0000000b, 0xd00a8a0d, 0xffb81020, 0x00009b40,
+	0x00009b40, 0x00009b40, 0x00001120, 0x000003ce, 0x001a0c00,
+	0x038919be, 0x06336f77, 0x6af65329, 0x08f186c8, 0x00046384,
+	0x00000000, 0x00000000, 0x00000880, 0xd03e4788, 0x002ac120,
+	0x002ac120, 0x002ac120, 0x1883800a, 0x00000108, 0x0a1a7caa,
+	0x18010000, 0x2e032402, 0x4a0a3c06, 0x621a540b, 0x764f6c1b,
+	0x845b7a5a, 0x950f8ccf, 0xa5cf9b4f, 0xbddfaf1f, 0xd1ffc93f,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000
 };
 
 static const uint16_t ar9160_cm_regs[] = {
@@ -536,57 +536,57 @@ static const uint16_t ar9160_cm_regs[] = {
 	P(0x080e0), P(0x080e4), P(0x080e8), P(0x080ec), P(0x080f0),
 	P(0x080f4), P(0x080f8), P(0x080fc), P(0x08100), P(0x08104),
 	P(0x08108), P(0x0810c), P(0x08110), P(0x08118), P(0x0811c),
-	P(0x08120), P(0x08124), P(0x08128), P(0x0812c), P(0x08130),
-	P(0x08134), P(0x08138), P(0x0813c), P(0x08144), P(0x08168),
-	P(0x0816c), P(0x08170), P(0x08174), P(0x08178), P(0x0817c),
-	P(0x081c4), P(0x081d0), P(0x081ec), P(0x081f0), P(0x081f4),
-	P(0x081f8), P(0x081fc), P(0x08200), P(0x08204), P(0x08208),
-	P(0x0820c), P(0x08210), P(0x08214), P(0x08218), P(0x0821c),
-	P(0x08220), P(0x08224), P(0x08228), P(0x0822c), P(0x08230),
-	P(0x08234), P(0x08238), P(0x0823c), P(0x08240), P(0x08244),
-	P(0x08248), P(0x0824c), P(0x08250), P(0x08254), P(0x08258),
-	P(0x0825c), P(0x08260), P(0x08270), P(0x08274), P(0x08278),
-	P(0x0827c), P(0x08284), P(0x08288), P(0x0828c), P(0x08294),
-	P(0x08298), P(0x08300), P(0x08304), P(0x08308), P(0x0830c),
-	P(0x08310), P(0x08314), P(0x08318), P(0x08328), P(0x0832c),
-	P(0x08330), P(0x08334), P(0x08338), P(0x0833c), P(0x08340),
-	P(0x09808), P(0x0980c), P(0x09810), P(0x09814), P(0x0981c),
-	P(0x0982c), P(0x09830), P(0x0983c), P(0x09840), P(0x0984c),
-	P(0x09854), P(0x09900), P(0x09904), P(0x09908), P(0x0990c),
-	P(0x0991c), P(0x09920), P(0x0a920), P(0x0b920), P(0x09928),
-	P(0x0992c), P(0x09934), P(0x09938), P(0x0993c), P(0x09948),
-	P(0x0994c), P(0x09954), P(0x09958), P(0x09940), P(0x0c95c),
-	P(0x09970), P(0x09974), P(0x09978), P(0x0997c), P(0x09980),
-	P(0x09984), P(0x09988), P(0x0998c), P(0x09990), P(0x09994),
-	P(0x09998), P(0x0999c), P(0x099a0), P(0x099a4), P(0x099a8),
-	P(0x099ac), P(0x099b0), P(0x099dc), P(0x099e0), P(0x099e4),
-	P(0x099e8), P(0x099ec), P(0x099fc), P(0x09b00), P(0x09b04),
-	P(0x09b08), P(0x09b0c), P(0x09b10), P(0x09b14), P(0x09b18),
-	P(0x09b1c), P(0x09b20), P(0x09b24), P(0x09b28), P(0x09b2c),
-	P(0x09b30), P(0x09b34), P(0x09b38), P(0x09b3c), P(0x09b40),
-	P(0x09b44), P(0x09b48), P(0x09b4c), P(0x09b50), P(0x09b54),
-	P(0x09b58), P(0x09b5c), P(0x09b60), P(0x09b64), P(0x09b68),
-	P(0x09b6c), P(0x09b70), P(0x09b74), P(0x09b78), P(0x09b7c),
-	P(0x09b80), P(0x09b84), P(0x09b88), P(0x09b8c), P(0x09b90),
-	P(0x09b94), P(0x09b98), P(0x09b9c), P(0x09ba0), P(0x09ba4),
-	P(0x09ba8), P(0x09bac), P(0x09bb0), P(0x09bb4), P(0x09bb8),
-	P(0x09bbc), P(0x09bc0), P(0x09bc4), P(0x09bc8), P(0x09bcc),
-	P(0x09bd0), P(0x09bd4), P(0x09bd8), P(0x09bdc), P(0x09be0),
-	P(0x09be4), P(0x09be8), P(0x09bec), P(0x09bf0), P(0x09bf4),
-	P(0x09bf8), P(0x09bfc), P(0x0a210), P(0x0a214), P(0x0a218),
-	P(0x0a220), P(0x0a224), P(0x0a228), P(0x0a22c), P(0x0a234),
-	P(0x0a238), P(0x0a23c), P(0x0a240), P(0x0a244), P(0x0a248),
-	P(0x0a24c), P(0x0a250), P(0x0a254), P(0x0a258), P(0x0a25c),
-	P(0x0a260), P(0x0a268), P(0x0a26c), P(0x0b26c), P(0x0c26c),
-	P(0x0d270), P(0x0a278), P(0x0a27c), P(0x0a338), P(0x0a33c),
-	P(0x0a340), P(0x0a344), P(0x0a348), P(0x0a34c), P(0x0a350),
-	P(0x0a354), P(0x0a358), P(0x0d35c), P(0x0d360), P(0x0d364),
-	P(0x0d368), P(0x0d36c), P(0x0d370), P(0x0d374), P(0x0d378),
-	P(0x0d37c), P(0x0d380), P(0x0d384), P(0x0a388), P(0x0a38c),
-	P(0x0a390), P(0x0a394), P(0x0a398), P(0x0a39c), P(0x0a3a0),
-	P(0x0a3a4), P(0x0a3a8), P(0x0a3ac), P(0x0a3b0), P(0x0a3b4),
-	P(0x0a3b8), P(0x0a3bc), P(0x0a3c0), P(0x0a3c4), P(0x0a3c8),
-	P(0x0a3cc), P(0x0a3d0), P(0x0a3d4), P(0x0a3dc), P(0x0a3e0)
+	P(0x08124), P(0x08128), P(0x0812c), P(0x08130), P(0x08134),
+	P(0x08138), P(0x0813c), P(0x08144), P(0x08168), P(0x0816c),
+	P(0x08170), P(0x08174), P(0x08178), P(0x0817c), P(0x081c4),
+	P(0x081ec), P(0x081f0), P(0x081f4), P(0x081f8), P(0x081fc),
+	P(0x08200), P(0x08204), P(0x08208), P(0x0820c), P(0x08210),
+	P(0x08214), P(0x08218), P(0x0821c), P(0x08220), P(0x08224),
+	P(0x08228), P(0x0822c), P(0x08230), P(0x08234), P(0x08238),
+	P(0x0823c), P(0x08240), P(0x08244), P(0x08248), P(0x0824c),
+	P(0x08250), P(0x08254), P(0x08258), P(0x0825c), P(0x08260),
+	P(0x08264), P(0x08270), P(0x08274), P(0x08278), P(0x0827c),
+	P(0x08284), P(0x08288), P(0x0828c), P(0x08294), P(0x08298),
+	P(0x08300), P(0x08304), P(0x08308), P(0x0830c), P(0x08310),
+	P(0x08314), P(0x08318), P(0x08328), P(0x0832c), P(0x08330),
+	P(0x08334), P(0x08338), P(0x0833c), P(0x08340), P(0x09808),
+	P(0x0980c), P(0x09810), P(0x09814), P(0x0981c), P(0x0982c),
+	P(0x09830), P(0x0983c), P(0x09840), P(0x0984c), P(0x09854),
+	P(0x09900), P(0x09904), P(0x09908), P(0x0990c), P(0x0991c),
+	P(0x09920), P(0x0a920), P(0x0b920), P(0x09928), P(0x0992c),
+	P(0x09934), P(0x09938), P(0x0993c), P(0x09948), P(0x0994c),
+	P(0x09954), P(0x09958), P(0x09940), P(0x0c95c), P(0x09970),
+	P(0x09974), P(0x09978), P(0x0997c), P(0x09980), P(0x09984),
+	P(0x09988), P(0x0998c), P(0x09990), P(0x09994), P(0x09998),
+	P(0x0999c), P(0x099a0), P(0x099a4), P(0x099a8), P(0x099ac),
+	P(0x099b0), P(0x099dc), P(0x099e0), P(0x099e4), P(0x099e8),
+	P(0x099ec), P(0x099fc), P(0x09b00), P(0x09b04), P(0x09b08),
+	P(0x09b0c), P(0x09b10), P(0x09b14), P(0x09b18), P(0x09b1c),
+	P(0x09b20), P(0x09b24), P(0x09b28), P(0x09b2c), P(0x09b30),
+	P(0x09b34), P(0x09b38), P(0x09b3c), P(0x09b40), P(0x09b44),
+	P(0x09b48), P(0x09b4c), P(0x09b50), P(0x09b54), P(0x09b58),
+	P(0x09b5c), P(0x09b60), P(0x09b64), P(0x09b68), P(0x09b6c),
+	P(0x09b70), P(0x09b74), P(0x09b78), P(0x09b7c), P(0x09b80),
+	P(0x09b84), P(0x09b88), P(0x09b8c), P(0x09b90), P(0x09b94),
+	P(0x09b98), P(0x09b9c), P(0x09ba0), P(0x09ba4), P(0x09ba8),
+	P(0x09bac), P(0x09bb0), P(0x09bb4), P(0x09bb8), P(0x09bbc),
+	P(0x09bc0), P(0x09bc4), P(0x09bc8), P(0x09bcc), P(0x09bd0),
+	P(0x09bd4), P(0x09bd8), P(0x09bdc), P(0x09be0), P(0x09be4),
+	P(0x09be8), P(0x09bec), P(0x09bf0), P(0x09bf4), P(0x09bf8),
+	P(0x09bfc), P(0x0a210), P(0x0a214), P(0x0a218), P(0x0a220),
+	P(0x0a224), P(0x0a228), P(0x0a22c), P(0x0a234), P(0x0a238),
+	P(0x0a23c), P(0x0a240), P(0x0a244), P(0x0a248), P(0x0a24c),
+	P(0x0a250), P(0x0a254), P(0x0a258), P(0x0a25c), P(0x0a260),
+	P(0x0a268), P(0x0a26c), P(0x0b26c), P(0x0c26c), P(0x0d270),
+	P(0x0a278), P(0x0a27c), P(0x0a338), P(0x0a33c), P(0x0a340),
+	P(0x0a344), P(0x0a348), P(0x0a34c), P(0x0a350), P(0x0a354),
+	P(0x0a358), P(0x0d35c), P(0x0d360), P(0x0d364), P(0x0d368),
+	P(0x0d36c), P(0x0d370), P(0x0d374), P(0x0d378), P(0x0d37c),
+	P(0x0d380), P(0x0d384), P(0x0a388), P(0x0a38c), P(0x0a390),
+	P(0x0a394), P(0x0a398), P(0x0a39c), P(0x0a3a0), P(0x0a3a4),
+	P(0x0a3a8), P(0x0a3ac), P(0x0a3b0), P(0x0a3b4), P(0x0a3b8),
+	P(0x0a3bc), P(0x0a3c0), P(0x0a3c4), P(0x0a3c8), P(0x0a3cc),
+	P(0x0a3d0), P(0x0a3d4), P(0x0a3dc), P(0x0a3e0)
 };
 
 static const uint32_t ar9160_cm_vals[] = {
@@ -614,57 +614,57 @@ static const uint32_t ar9160_cm_vals[] = {
 	0xffffffff, 0x0000ffff, 0x003f3f3f, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00020000, 0x00020000, 0x00000001,
 	0x00000052, 0x00000000, 0x00000168, 0x000100aa, 0x00003210,
-	0x08f04800, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0xffffffff, 0x00000000,
-	0x00000000, 0x32143320, 0xfaa4fa50, 0x00000100, 0x00000000,
-	0x00000000, 0x00003210, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00100000, 0x0010f400,
-	0x00000100, 0x0001e800, 0x00000000, 0x00000000, 0x00000000,
-	0x400000ff, 0x00080922, 0x00000000, 0x40000000, 0x003e4180,
-	0x00000000, 0x0000002c, 0x0000002c, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000007,
-	0x00000302, 0x00000e00, 0x00ff0000, 0x00000000, 0x000107ff,
-	0x00000000, 0xad848e19, 0x7d14e000, 0x9c0a9f6b, 0x00000000,
-	0x0000a000, 0x00000000, 0x00200400, 0x206a01ae, 0x1284233c,
-	0x00000859, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x10000fff, 0x05100000, 0x05100000, 0x05100000, 0x00000001,
-	0x00000004, 0x1e1f2022, 0x0a0b0c0d, 0x00000000, 0x9280b212,
-	0x00020028, 0x5f3ca3de, 0x2108ecff, 0x00750604, 0x004b6a8e,
-	0x190fb515, 0x00000000, 0x00000001, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x201fff00,
-	0x006f0000, 0x03051000, 0x00000000, 0x00000200, 0xaaaaaaaa,
-	0x3c466478, 0x0cc80caa, 0x00001042, 0x00000000, 0x00000001,
-	0x00000002, 0x00000003, 0x00000004, 0x00000005, 0x00000008,
-	0x00000009, 0x0000000a, 0x0000000b, 0x0000000c, 0x0000000d,
-	0x00000010, 0x00000011, 0x00000012, 0x00000013, 0x00000014,
-	0x00000015, 0x00000018, 0x00000019, 0x0000001a, 0x0000001b,
-	0x0000001c, 0x0000001d, 0x00000020, 0x00000021, 0x00000022,
-	0x00000023, 0x00000024, 0x00000025, 0x00000028, 0x00000029,
-	0x0000002a, 0x0000002b, 0x0000002c, 0x0000002d, 0x00000030,
-	0x00000031, 0x00000032, 0x00000033, 0x00000034, 0x00000035,
-	0x00000035, 0x00000035, 0x00000035, 0x00000035, 0x00000035,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0xffffffff, 0x00000000, 0x00000000,
+	0x32143320, 0xfaa4fa50, 0x00000100, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00100000, 0x0010f400, 0x00000100, 0x0001e800,
+	0x00000000, 0x00000000, 0x00000000, 0x400000ff, 0x00080922,
+	0x88a00010, 0x00000000, 0x40000000, 0x003e4180, 0x00000000,
+	0x0000002c, 0x0000002c, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000007, 0x00000302,
+	0x00000e00, 0x00ff0000, 0x00000000, 0x000107ff, 0x00000000,
+	0xad848e19, 0x7d14e000, 0x9c0a9f6b, 0x00000000, 0x0000a000,
+	0x00000000, 0x00200400, 0x206a01ae, 0x1284233c, 0x00000859,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x10000fff,
+	0x05100000, 0x05100000, 0x05100000, 0x00000001, 0x00000004,
+	0x1e1f2022, 0x0a0b0c0d, 0x00000000, 0x9280b212, 0x00020028,
+	0x5f3ca3de, 0x2108ecff, 0x00750604, 0x004b6a8e, 0x190fb515,
+	0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000001, 0x201fff00, 0x006f0000,
+	0x03051000, 0x00000000, 0x00000200, 0xaaaaaaaa, 0x3c466478,
+	0x0cc80caa, 0x00001042, 0x00000000, 0x00000001, 0x00000002,
+	0x00000003, 0x00000004, 0x00000005, 0x00000008, 0x00000009,
+	0x0000000a, 0x0000000b, 0x0000000c, 0x0000000d, 0x00000010,
+	0x00000011, 0x00000012, 0x00000013, 0x00000014, 0x00000015,
+	0x00000018, 0x00000019, 0x0000001a, 0x0000001b, 0x0000001c,
+	0x0000001d, 0x00000020, 0x00000021, 0x00000022, 0x00000023,
+	0x00000024, 0x00000025, 0x00000028, 0x00000029, 0x0000002a,
+	0x0000002b, 0x0000002c, 0x0000002d, 0x00000030, 0x00000031,
+	0x00000032, 0x00000033, 0x00000034, 0x00000035, 0x00000035,
 	0x00000035, 0x00000035, 0x00000035, 0x00000035, 0x00000035,
 	0x00000035, 0x00000035, 0x00000035, 0x00000035, 0x00000035,
 	0x00000035, 0x00000035, 0x00000035, 0x00000035, 0x00000035,
-	0x00000010, 0x0000001a, 0x40806333, 0x00106c10, 0x009c4060,
-	0x018830c6, 0x00000400, 0x001a0bb5, 0x00000000, 0x20202020,
-	0x20202020, 0x13c889af, 0x38490a20, 0x00007bb6, 0x0fff3ffc,
-	0x00000001, 0x0000e000, 0x00000000, 0x0cc75380, 0x0f0f0f01,
-	0xdfa91f01, 0x00000001, 0x0ebae9c6, 0x0ebae9c6, 0x0ebae9c6,
-	0x00820820, 0x1ce739ce, 0x050701ce, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x3fffffff, 0x3fffffff, 0x3fffffff,
-	0x0003ffff, 0x79bfaa03, 0x07ffffef, 0x0fffffe7, 0x17ffffe5,
-	0x1fffffe4, 0x37ffffe3, 0x3fffffe3, 0x57ffffe3, 0x5fffffe2,
-	0x7fffffe2, 0x7f3c7bba, 0xf3307ff0, 0x0c000000, 0x20202020,
-	0x20202020, 0x1ce739ce, 0x000001ce, 0x00000001, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000246,
-	0x20202020, 0x20202020, 0x20202020, 0x1ce739ce, 0x000001ce
+	0x00000035, 0x00000035, 0x00000035, 0x00000035, 0x00000010,
+	0x0000001a, 0x40806333, 0x00106c10, 0x009c4060, 0x018830c6,
+	0x00000400, 0x001a0bb5, 0x00000000, 0x20202020, 0x20202020,
+	0x13c889af, 0x38490a20, 0x00007bb6, 0x0fff3ffc, 0x00000001,
+	0x0000e000, 0x00000000, 0x0cc75380, 0x0f0f0f01, 0xdfa91f01,
+	0x00000001, 0x0e79e5c6, 0x0e79e5c6, 0x0e79e5c6, 0x00820820,
+	0x1ce739ce, 0x050701ce, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x3fffffff, 0x3fffffff, 0x3fffffff, 0x0003ffff,
+	0x79bfaa03, 0x07ffffef, 0x0fffffe7, 0x17ffffe5, 0x1fffffe4,
+	0x37ffffe3, 0x3fffffe3, 0x57ffffe3, 0x5fffffe2, 0x7fffffe2,
+	0x7f3c7bba, 0xf3307ff0, 0x0c000000, 0x20202020, 0x20202020,
+	0x1ce739ce, 0x000001ce, 0x00000001, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000246, 0x20202020,
+	0x20202020, 0x20202020, 0x1ce739ce, 0x000001ce
 };
 
 static const struct athn_ini ar9160_ini = {
diff --git a/sys/dev/ic/ar9280reg.h b/sys/dev/ic/ar9280reg.h
index 4919680d3e4..ff4fa8213eb 100644
--- a/sys/dev/ic/ar9280reg.h
+++ b/sys/dev/ic/ar9280reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9280reg.h,v 1.3 2010/07/15 19:07:43 damien Exp $	*/
+/*	$OpenBSD: ar9280reg.h,v 1.4 2010/07/15 19:24:04 damien Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -48,10 +48,9 @@ static const uint16_t ar9280_2_0_regs[] = {
 	P(0x09860), P(0x09864), P(0x09868), P(0x0986c), P(0x09914),
 	P(0x09918), P(0x09924), P(0x09944), P(0x09960), P(0x0a960),
 	P(0x09964), P(0x0c968), P(0x099b8), P(0x099bc), P(0x099c0),
-	P(0x099c4), P(0x099c8), P(0x099cc), P(0x099d0), P(0x099d4),
-	P(0x099d8), P(0x0a204), P(0x0a20c), P(0x0b20c), P(0x0a21c),
-	P(0x0a230), P(0x0a23c), P(0x0a250), P(0x0a358), P(0x0a388),
-	P(0x0a3d8), P(0x07894)
+	P(0x0a204), P(0x0a20c), P(0x0b20c), P(0x0a21c), P(0x0a230),
+	P(0x0a23c), P(0x0a250), P(0x0a358), P(0x0a388), P(0x0a3d8),
+	P(0x07894)
 };
 
 static const uint32_t ar9280_2_0_vals_5g20[] = {
@@ -62,10 +61,9 @@ static const uint32_t ar9280_2_0_vals_5g20[] = {
 	0x00048d18, 0x0001ce00, 0x5ac640d0, 0x06903081, 0x000007d0,
 	0x0000000a, 0xd00a8a0b, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003b5, 0x0000001c, 0x00000a00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x00000014, 0x00000014, 0x1883800a,
-	0x00000000, 0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x00000014, 0x00000014, 0x1883800a, 0x00000000,
+	0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000, 0x00000000,
+	0x5a508000
 };
 
 #ifndef IEEE80211_NO_HT
@@ -77,10 +75,9 @@ static const uint32_t ar9280_2_0_vals_5g40[] = {
 	0x00048d18, 0x0001ce00, 0x5ac640d0, 0x06903081, 0x00000fa0,
 	0x00000014, 0xd00a8a0b, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003b5, 0x0000001c, 0x00000a00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x00000014, 0x00000014, 0x1883800a,
-	0x00000000, 0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x00000014, 0x00000014, 0x1883800a, 0x00000000,
+	0x13c88000, 0x001ff000, 0x7999aa02, 0x0c000000, 0x00000000,
+	0x5a508000
 };
 
 static const uint32_t ar9280_2_0_vals_2g40[] = {
@@ -91,10 +88,9 @@ static const uint32_t ar9280_2_0_vals_2g40[] = {
 	0x00048d20, 0x0001ce00, 0x5ac640d0, 0x06903881, 0x00001130,
 	0x00000268, 0xd00a8a0d, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003ce, 0x0000001c, 0x00000c00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x0001f019, 0x0001f019, 0x1883800a,
-	0x00000210, 0x13c88001, 0x0004a000, 0x7999aa0e, 0x08000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x0001f019, 0x0001f019, 0x1883800a, 0x00000210,
+	0x13c88001, 0x0004a000, 0x7999aa0e, 0x08000000, 0x00000000,
+	0x5a508000
 };
 #endif
 
@@ -106,10 +102,9 @@ static const uint32_t ar9280_2_0_vals_2g20[] = {
 	0x00048d20, 0x0001ce00, 0x5ac640d0, 0x06903881, 0x00000898,
 	0x0000000b, 0xd00a8a0d, 0xffbc1010, 0x00000010, 0x00000010,
 	0x00000210, 0x000003ce, 0x0000001c, 0x00000c00, 0x05eea6d4,
-	0x06336f77, 0x60f65329, 0x08f186c8, 0x00046384, 0x00000000,
-	0x00000000, 0x00000444, 0x0001f019, 0x0001f019, 0x1883800a,
-	0x00000108, 0x13c88000, 0x0004a000, 0x7999aa0e, 0x0c000000,
-	0x00000000, 0x5a508000
+	0x00000444, 0x0001f019, 0x0001f019, 0x1883800a, 0x00000108,
+	0x13c88000, 0x0004a000, 0x7999aa0e, 0x0c000000, 0x00000000,
+	0x5a508000
 };
 
 static const uint16_t ar9280_2_0_cm_regs[] = {
@@ -160,20 +155,21 @@ static const uint16_t ar9280_2_0_cm_regs[] = {
 	P(0x0c95c), P(0x09970), P(0x09974), P(0x09978), P(0x0997c),
 	P(0x09980), P(0x09984), P(0x09988), P(0x0998c), P(0x09990),
 	P(0x09994), P(0x09998), P(0x0999c), P(0x099a0), P(0x099a4),
-	P(0x099a8), P(0x099ac), P(0x099b0), P(0x099b4), P(0x099dc),
-	P(0x099e0), P(0x099e4), P(0x099e8), P(0x099ec), P(0x099f0),
-	P(0x099fc), P(0x0a208), P(0x0a210), P(0x0a214), P(0x0a218),
-	P(0x0a220), P(0x0a224), P(0x0a228), P(0x0a22c), P(0x0a234),
-	P(0x0a238), P(0x0a240), P(0x0a244), P(0x0a248), P(0x0a24c),
-	P(0x0a254), P(0x0a258), P(0x0a25c), P(0x0a260), P(0x0a268),
-	P(0x0a26c), P(0x0b26c), P(0x0d270), P(0x0a278), P(0x0d35c),
-	P(0x0d360), P(0x0d364), P(0x0d368), P(0x0d36c), P(0x0d370),
-	P(0x0d374), P(0x0d378), P(0x0d37c), P(0x0d380), P(0x0d384),
-	P(0x0a38c), P(0x0a390), P(0x0a394), P(0x0a398), P(0x0a39c),
-	P(0x0a3a0), P(0x0a3a4), P(0x0a3a8), P(0x0a3ac), P(0x0a3b0),
-	P(0x0a3b4), P(0x0a3b8), P(0x0a3bc), P(0x0a3c0), P(0x0a3c4),
-	P(0x0a3c8), P(0x0a3cc), P(0x0a3d0), P(0x0a3d4), P(0x0a3dc),
-	P(0x0a3e0), P(0x0a3e4), P(0x0a3e8), P(0x0a3ec), P(0x07800),
+	P(0x099a8), P(0x099ac), P(0x099b0), P(0x099b4), P(0x099c4),
+	P(0x099c8), P(0x099cc), P(0x099d0), P(0x099d4), P(0x099d8),
+	P(0x099dc), P(0x099e0), P(0x099e4), P(0x099e8), P(0x099ec),
+	P(0x099f0), P(0x099fc), P(0x0a208), P(0x0a210), P(0x0a214),
+	P(0x0a218), P(0x0a220), P(0x0a224), P(0x0a228), P(0x0a22c),
+	P(0x0a234), P(0x0a238), P(0x0a240), P(0x0a244), P(0x0a248),
+	P(0x0a24c), P(0x0a254), P(0x0a258), P(0x0a25c), P(0x0a260),
+	P(0x0a268), P(0x0a26c), P(0x0b26c), P(0x0d270), P(0x0a278),
+	P(0x0d35c), P(0x0d360), P(0x0d364), P(0x0d368), P(0x0d36c),
+	P(0x0d370), P(0x0d374), P(0x0d378), P(0x0d37c), P(0x0d380),
+	P(0x0d384), P(0x0a38c), P(0x0a390), P(0x0a394), P(0x0a398),
+	P(0x0a39c), P(0x0a3a0), P(0x0a3a4), P(0x0a3a8), P(0x0a3ac),
+	P(0x0a3b0), P(0x0a3b4), P(0x0a3b8), P(0x0a3bc), P(0x0a3c0),
+	P(0x0a3c4), P(0x0a3c8), P(0x0a3cc), P(0x0a3d0), P(0x0a3d4),
+	P(0x0a3dc), P(0x0a3e0), P(0x0a3e4), P(0x0a3e8), P(0x07800),
 	P(0x07804), P(0x07808), P(0x0780c), P(0x07810), P(0x07818),
 	P(0x07824), P(0x07828), P(0x0782c), P(0x07830), P(0x07834),
 	P(0x0783c), P(0x07848), P(0x0784c), P(0x07850), P(0x07854),
@@ -227,23 +223,24 @@ static const uint32_t ar9280_2_0_cm_vals[] = {
 	0x00000000, 0x01002310, 0x10000fff, 0x04900000, 0x04900000,
 	0x00000001, 0x00000004, 0x1e1f2022, 0x0a0b0c0d, 0x00000000,
 	0x9280c00a, 0x00020028, 0x5f3ca3de, 0x2108ecff, 0x14750604,
-	0x004b6a8e, 0x190fb515, 0x00000000, 0x00000001, 0x00000000,
+	0x004b6a8e, 0x190fb514, 0x00000000, 0x00000001, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001,
-	0x201fff00, 0x006f0000, 0x03051000, 0x00000820, 0x00000000,
-	0x00000000, 0xaaaaaaaa, 0x3c466478, 0x0cc80caa, 0x00000000,
-	0x00001042, 0x803e4788, 0x4080a333, 0x40206c10, 0x009c4060,
-	0x01834061, 0x00000400, 0x000003b5, 0x233f7180, 0x20202020,
-	0x20202020, 0x38490a20, 0x00007bb6, 0x0fff3ffc, 0x00000000,
-	0x00000000, 0x0cdbd380, 0x0f0f0f01, 0xdfa91f01, 0x00000000,
-	0x0e79e5c6, 0x0e79e5c6, 0x00820820, 0x1ce739ce, 0x07ffffef,
-	0x0fffffe7, 0x17ffffe5, 0x1fffffe4, 0x37ffffe3, 0x3fffffe3,
-	0x57ffffe3, 0x5fffffe2, 0x7fffffe2, 0x7f3c7bba, 0xf3307ff0,
-	0x20202020, 0x20202020, 0x1ce739ce, 0x000001ce, 0x00000001,
+	0x201fff00, 0x006f0000, 0x03051000, 0x00000820, 0x06336f77,
+	0x6af6532f, 0x08f186c8, 0x00046384, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0xaaaaaaaa, 0x3c466478, 0x0cc80caa,
+	0x00000000, 0x00001042, 0x803e4788, 0x4080a333, 0x40206c10,
+	0x009c4060, 0x01834061, 0x00000400, 0x000003b5, 0x233f7180,
+	0x20202020, 0x20202020, 0x38490a20, 0x00007bb6, 0x0fff3ffc,
+	0x00000000, 0x00000000, 0x0cdbd380, 0x0f0f0f01, 0xdfa91f01,
+	0x00000000, 0x0e79e5c6, 0x0e79e5c6, 0x00820820, 0x1ce739ce,
+	0x07ffffef, 0x0fffffe7, 0x17ffffe5, 0x1fffffe4, 0x37ffffe3,
+	0x3fffffe3, 0x57ffffe3, 0x5fffffe2, 0x7fffffe2, 0x7f3c7bba,
+	0xf3307ff0, 0x20202020, 0x20202020, 0x1ce739ce, 0x000001ce,
+	0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000246, 0x20202020, 0x20202020, 0x20202020, 0x1ce739ce,
-	0x000001ce, 0x00000000, 0x18c43433, 0x00f70081, 0x00040000,
+	0x00000000, 0x00000246, 0x20202020, 0x20202020, 0x20202020,
+	0x1ce739ce, 0x000001ce, 0x00000000, 0x18c43433, 0x00040000,
 	0xdb005012, 0x04924914, 0x21084210, 0x6d801300, 0x07e41000,
 	0x00040000, 0xdb005012, 0x04924914, 0x21084210, 0x6d801300,
 	0x07e40000, 0x00100000, 0x773f0567, 0x54214514, 0x12035828,
@@ -300,8 +297,9 @@ static const uint16_t ar9280_2_0_tx_gain_regs[] = {
 	P(0x0a30c), P(0x0a310), P(0x0a314), P(0x0a318), P(0x0a31c),
 	P(0x0a320), P(0x0a324), P(0x0a328), P(0x0a32c), P(0x0a330),
 	P(0x0a334), P(0x0a338), P(0x0a33c), P(0x0a340), P(0x0a344),
-	P(0x0a348), P(0x0a34c), P(0x0a350), P(0x0a354), P(0x07814),
-	P(0x07838), P(0x0781c), P(0x07840), P(0x07820), P(0x07844)
+	P(0x0a348), P(0x0a34c), P(0x0a350), P(0x0a354), P(0x0a3ec),
+	P(0x07814), P(0x07838), P(0x0781c), P(0x07840), P(0x07820),
+	P(0x07844)
 };
 
 static const uint32_t ar9280_2_0_tx_gain_vals_5g[] = {
@@ -309,8 +307,9 @@ static const uint32_t ar9280_2_0_tx_gain_vals_5g[] = {
 	0x0000a006, 0x0000e012, 0x00011014, 0x0001504a, 0x0001904c,
 	0x0001c04e, 0x00020092, 0x0002410a, 0x0002710c, 0x0002b18b,
 	0x0002e1cc, 0x000321ec, 0x000321ec, 0x000321ec, 0x000321ec,
-	0x000321ec, 0x000321ec, 0x000321ec, 0x000321ec, 0x0019beff,
-	0x0019beff, 0x00392000, 0x00392000, 0x92592480, 0x92592480
+	0x000321ec, 0x000321ec, 0x000321ec, 0x000321ec, 0x00f70081,
+	0x0019beff, 0x0019beff, 0x00392000, 0x00392000, 0x92592480,
+	0x92592480
 };
 
 static const uint32_t ar9280_2_0_tx_gain_vals_2g[] = {
@@ -318,8 +317,9 @@ static const uint32_t ar9280_2_0_tx_gain_vals_2g[] = {
 	0x0000b00b, 0x0000e012, 0x00012048, 0x0001604a, 0x0001a211,
 	0x0001e213, 0x0002121b, 0x00024412, 0x00028414, 0x0002b44a,
 	0x00030649, 0x0003364b, 0x00038a49, 0x0003be48, 0x0003ee4a,
-	0x00042e88, 0x00046e8a, 0x00049ec9, 0x0004bf42, 0x0019beff,
-	0x0019beff, 0x00392000, 0x00392000, 0x92592480, 0x92592480
+	0x00042e88, 0x00046e8a, 0x00049ec9, 0x0004bf42, 0x00f70081,
+	0x0019beff, 0x0019beff, 0x00392000, 0x00392000, 0x92592480,
+	0x92592480
 };
 
 static const struct athn_gain ar9280_2_0_tx_gain = {
@@ -334,8 +334,9 @@ static const uint32_t ar9280_2_0_tx_gain_high_power_vals_5g[] = {
 	0x0000a006, 0x0000e012, 0x00011014, 0x0001504a, 0x0001904c,
 	0x0001c04e, 0x00021092, 0x0002510a, 0x0002910c, 0x0002c18b,
 	0x0002f1cc, 0x000321eb, 0x000341ec, 0x000341ec, 0x000341ec,
-	0x000341ec, 0x000341ec, 0x000341ec, 0x000341ec, 0x00198eff,
-	0x00198eff, 0x00172000, 0x00172000, 0xf258a480, 0xf258a480
+	0x000341ec, 0x000341ec, 0x000341ec, 0x000341ec, 0x00f70081,
+	0x00198eff, 0x00198eff, 0x00172000, 0x00172000, 0xf258a480,
+	0xf258a480
 };
 
 static const uint32_t ar9280_2_0_tx_gain_high_power_vals_2g[] = {
@@ -343,8 +344,9 @@ static const uint32_t ar9280_2_0_tx_gain_high_power_vals_2g[] = {
 	0x0000c010, 0x00010012, 0x00013014, 0x0001820a, 0x0001b211,
 	0x0001e213, 0x00022411, 0x00025413, 0x00029811, 0x0002c813,
 	0x00030a14, 0x00035a50, 0x00039c4c, 0x0003de8a, 0x00042e92,
-	0x00046ed2, 0x0004bed5, 0x0004ff54, 0x00055fd5, 0x00198eff,
-	0x00198eff, 0x00172000, 0x00172000, 0xf258a480, 0xf258a480
+	0x00046ed2, 0x0004bed5, 0x0004ff54, 0x00055fd5, 0x00f70081,
+	0x00198eff, 0x00198eff, 0x00172000, 0x00172000, 0xf258a480,
+	0xf258a480
 };
 
 static const struct athn_gain ar9280_2_0_tx_gain_high_power = {
@@ -416,7 +418,7 @@ static const uint32_t ar9280_2_0_rx_gain_vals_5g[] = {
 };
 
 static const uint32_t ar9280_2_0_rx_gain_vals_2g[] = {
-	0x00000290, 0x00000300, 0x00000304, 0x00000308, 0x0000030c,
+	0x00008000, 0x00008000, 0x00008000, 0x00008000, 0x00008000,
 	0x00008000, 0x00008004, 0x00008008, 0x0000800c, 0x00008080,
 	0x00008084, 0x00008088, 0x0000808c, 0x00008100, 0x00008104,
 	0x00008108, 0x0000810c, 0x00008110, 0x00008114, 0x00008180,
@@ -555,23 +557,23 @@ static const uint32_t ar9280_2_0_rx_gain_23db_backoff_vals_2g[] = {
 	0x00008224, 0x00008290, 0x00008300, 0x00008304, 0x00008308,
 	0x0000830c, 0x00008380, 0x00008384, 0x00008700, 0x00008704,
 	0x00008708, 0x0000870c, 0x00008780, 0x00008784, 0x00008b00,
-	0x00008b04, 0x00008b08, 0x00008b0c, 0x00008b10, 0x00008b14,
-	0x00008b01, 0x00008b05, 0x00008b09, 0x00008b0d, 0x00008b11,
-	0x00008b15, 0x00008b02, 0x00008b06, 0x00008b0a, 0x00008b0e,
-	0x00008b12, 0x00008b16, 0x00008b03, 0x00008b07, 0x00008b0b,
-	0x00008b0f, 0x00008b13, 0x00008b17, 0x00008b23, 0x00008b27,
-	0x00008b2b, 0x00008b2f, 0x00008b33, 0x00008b37, 0x00008b43,
-	0x00008b47, 0x00008b4b, 0x00008b4f, 0x00008b53, 0x00008b57,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00008b5b,
-	0x00008b5b, 0x00008b5b, 0x00008b5b, 0x00001050, 0x00001050
+	0x00008b04, 0x00008b08, 0x00008b0c, 0x00008b10, 0x00008b80,
+	0x00008b84, 0x00008b88, 0x00008b8c, 0x00008b90, 0x00008b94,
+	0x00008b98, 0x00008ba4, 0x00008ba8, 0x00008bac, 0x00008bb0,
+	0x00008bb4, 0x00008ba1, 0x00008ba5, 0x00008ba9, 0x00008bad,
+	0x00008bb1, 0x00008bb5, 0x00008ba2, 0x00008ba6, 0x00008baa,
+	0x00008bae, 0x00008bb2, 0x00008bb6, 0x00008ba3, 0x00008ba7,
+	0x00008bab, 0x00008baf, 0x00008bb3, 0x00008bb7, 0x00008bc3,
+	0x00008bc7, 0x00008bcb, 0x00008bcf, 0x00008bd3, 0x00008bd7,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00008bdb,
+	0x00008bdb, 0x00008bdb, 0x00008bdb, 0x00001055, 0x00001055
 };
 
 static const struct athn_gain ar9280_2_0_rx_gain_23db_backoff = {