update initialization values for the Osprey 2.2.

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

1 files changed, 279 insertions, 249 deletions

diff --git a/sys/dev/ic/ar9380reg.h b/sys/dev/ic/ar9380reg.h
index 24cdd9e1ffa..31a4ee6ba31 100644
--- a/sys/dev/ic/ar9380reg.h
+++ b/sys/dev/ic/ar9380reg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9380reg.h,v 1.9 2010/10/18 16:05:28 damien Exp $	*/
+/*	$OpenBSD: ar9380reg.h,v 1.10 2010/10/19 16:58:17 damien Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -325,14 +325,14 @@ static const uint16_t ar9380_2_2_regs[] = {
 	P(0x16540), P(0x1690c), P(0x16940), P(0x09810), P(0x09820),
 	P(0x09824), P(0x09828), P(0x0982c), P(0x09830), P(0x09c00),
 	P(0x09e00), P(0x09e04), P(0x09e0c), P(0x09e10), P(0x09e14),
-	P(0x09e18), P(0x09e1c), P(0x09e20), P(0x09e2c), P(0x09e44),
-	P(0x09e48), P(0x09fc8), P(0x0a204), P(0x0a208), P(0x0a230),
-	P(0x0a234), P(0x0a238), P(0x0a250), P(0x0a254), P(0x0a258),
-	P(0x0a25c), P(0x0a260), P(0x0a264), P(0x0a280), P(0x0a284),
-	P(0x0a288), P(0x0a28c), P(0x0a2c4), P(0x0a2d0), P(0x0a2d8),
-	P(0x0a358), P(0x0a830), P(0x0ae04), P(0x0ae18), P(0x0ae1c),
-	P(0x0ae20), P(0x0b284), P(0x0b830), P(0x0be04), P(0x0be18),
-	P(0x0be1c), P(0x0be20), P(0x0c284)
+	P(0x09e18), P(0x09e1c), P(0x09e20), P(0x09e2c), P(0x09e3c),
+	P(0x09e44), P(0x09e48), P(0x09fc8), P(0x0a204), P(0x0a208),
+	P(0x0a230), P(0x0a234), P(0x0a238), P(0x0a250), P(0x0a254),
+	P(0x0a258), P(0x0a25c), P(0x0a260), P(0x0a264), P(0x0a280),
+	P(0x0a284), P(0x0a288), P(0x0a28c), P(0x0a2c4), P(0x0a2d0),
+	P(0x0a2d8), P(0x0a358), P(0x0a830), P(0x0ae04), P(0x0ae18),
+	P(0x0ae1c), P(0x0ae20), P(0x0b284), P(0x0b830), P(0x0be04),
+	P(0x0be18), P(0x0be1c), P(0x0be20), P(0x0c284)
 };
 
 static const uint32_t ar9380_2_2_vals_5g20[] = {
@@ -341,15 +341,15 @@ static const uint32_t ar9380_2_2_vals_5g20[] = {
 	0xa4653c00, 0x03284f3e, 0x08000000, 0x10804008, 0x08000000,
 	0x10804008, 0x08000000, 0x10804008, 0xd00a8005, 0x206a022e,
 	0x5ac640d0, 0x06903081, 0x05eea6d4, 0x0000059c, 0x000000c4,
-	0x0372161e, 0x00802020, 0x6c4000e2, 0x7ec88d2e, 0x31395d5e,
-	0x00000000, 0x0001cf9c, 0x000003b5, 0x0000001c, 0x02321e27,
-	0x5030201a, 0x0003f000, 0x000037c0, 0x00000104, 0x0000000a,
-	0x00000fff, 0xffb81018, 0x00000000, 0x000007d0, 0x02020002,
-	0x01000e0e, 0x0a021501, 0x00000e0e, 0x00000007, 0x00000000,
-	0x00000110, 0x00022222, 0x00158d18, 0x00071981, 0xf999a83a,
-	0x00000000, 0x0000019c, 0x00800000, 0x00000000, 0x0000019c,
-	0x000001b5, 0x00000000, 0x0000019c, 0x00800000, 0x00000000,
-	0x0000019c, 0x000001b5, 0x00000000
+	0x0372111a, 0x001c2020, 0x6c4000e2, 0x7ec88d2e, 0x37b95d5e,
+	0x00000000, 0x0001cf9c, 0x000003b5, 0x0000001c, 0xcf946220,
+	0x02321e27, 0x5030201a, 0x0003f000, 0x000037c0, 0x00000104,
+	0x0000000a, 0x00000fff, 0xffb81018, 0x00000000, 0x000007d0,
+	0x02020002, 0x01000e0e, 0x0a021501, 0x00000e0e, 0x00000007,
+	0x00000000, 0x00000110, 0x00022222, 0x00158d18, 0x00071981,
+	0x7999a83a, 0x00000000, 0x0000019c, 0x001c0000, 0x00000000,
+	0x0000019c, 0x000001b5, 0x00000000, 0x0000019c, 0x001c0000,
+	0x00000000, 0x0000019c, 0x000001b5, 0x00000000
 };
 
 #ifndef IEEE80211_NO_HT
@@ -359,15 +359,15 @@ static const uint32_t ar9380_2_2_vals_5g40[] = {
 	0xa4653c00, 0x03284f3e, 0x00000000, 0x10804008, 0x00000000,
 	0x10804008, 0x00000000, 0x10804008, 0xd00a8005, 0x206a022e,
 	0x5ac640d0, 0x06903081, 0x05eea6d4, 0x0000059c, 0x000000c4,
-	0x0372161e, 0x00802020, 0x6d4000e2, 0x7ec88d2e, 0x3139605e,
-	0x00000000, 0x0001cf9c, 0x000003b5, 0x0000001c, 0x02321e27,
-	0x5030201a, 0x0003f000, 0x000037c4, 0x00000104, 0x00000014,
-	0x10000fff, 0xffb81018, 0x00000000, 0x00000fa0, 0x02020002,
-	0x01000e0e, 0x0a021501, 0x00000e0e, 0x00000007, 0x00000000,
-	0x00000110, 0x00022222, 0x00158d18, 0x00071981, 0xf999a83a,
-	0x00000000, 0x0000019c, 0x00800000, 0x00000000, 0x0000019c,
-	0x000001b5, 0x00000000, 0x0000019c, 0x00800000, 0x00000000,
-	0x0000019c, 0x000001b5, 0x00000000
+	0x0372111a, 0x001c2020, 0x6d4000e2, 0x7ec88d2e, 0x37b9605e,
+	0x00000000, 0x0001cf9c, 0x000003b5, 0x0000001c, 0xcf946220,
+	0x02321e27, 0x5030201a, 0x0003f000, 0x000037c4, 0x00000104,
+	0x00000014, 0x10000fff, 0xffb81018, 0x00000000, 0x00000fa0,
+	0x02020002, 0x01000e0e, 0x0a021501, 0x00000e0e, 0x00000007,
+	0x00000000, 0x00000110, 0x00022222, 0x00158d18, 0x00071981,
+	0x7999a83a, 0x00000000, 0x0000019c, 0x001c0000, 0x00000000,
+	0x0000019c, 0x000001b5, 0x00000000, 0x0000019c, 0x001c0000,
+	0x00000000, 0x0000019c, 0x000001b5, 0x00000000
 };
 
 static const uint32_t ar9380_2_2_vals_2g40[] = {
@@ -376,15 +376,15 @@ static const uint32_t ar9380_2_2_vals_2g40[] = {
 	0x24652800, 0x05d08f20, 0x00000000, 0x50804008, 0x00000000,
 	0x50804008, 0x00000000, 0x50804008, 0xd00a8011, 0x206a012e,
 	0x5ac640d0, 0x06903881, 0x05eea6d4, 0x0000119c, 0x000000c4,
-	0x037216a0, 0x00802020, 0x6d4000e2, 0x7ec84d2e, 0x3139605e,
-	0x00000000, 0x00021f9c, 0x000003ce, 0x00000021, 0x02291e27,
-	0x50302012, 0x0001a000, 0x000037c4, 0x00000004, 0x00000016,
-	0x10000fff, 0xffb81018, 0x00000210, 0x00001130, 0x02020002,
-	0x01000e0e, 0x3a021501, 0x00000e0e, 0x0000000b, 0x00000150,
-	0x00000110, 0x00022222, 0x00158d18, 0x00071981, 0xf999a83a,
-	0x00000000, 0x0000019c, 0x00800000, 0x00000000, 0x0000019c,
-	0x000001ce, 0x00000150, 0x0000019c, 0x00800000, 0x00000000,
-	0x0000019c, 0x000001ce, 0x00000150
+	0x037216a0, 0x001c2020, 0x6d4000e2, 0x7ec84d2e, 0x3379605e,
+	0x00000000, 0x00021f9c, 0x000003ce, 0x00000021, 0xcf946222,
+	0x02291e27, 0x50302012, 0x0001a000, 0x000037c4, 0x00000004,
+	0x00000016, 0x10000fff, 0xffb81018, 0x00000210, 0x00001130,
+	0x02020002, 0x01000e0e, 0x3a021501, 0x00000e0e, 0x0000000b,
+	0x00000150, 0x00000110, 0x00022222, 0x00158d18, 0x00071981,
+	0x7999a83a, 0x00000000, 0x0000019c, 0x001c0000, 0x00000000,
+	0x0000019c, 0x000001ce, 0x00000150, 0x0000019c, 0x001c0000,
+	0x00000000, 0x0000019c, 0x000001ce, 0x00000150
 };
 #endif
 
@@ -394,15 +394,15 @@ static const uint32_t ar9380_2_2_vals_2g20[] = {
 	0x24652800, 0x05d08f20, 0x00000000, 0x50804008, 0x00000000,
 	0x50804008, 0x00000000, 0x50804008, 0xd00a8011, 0x206a012e,
 	0x5ac640d0, 0x06903881, 0x05eea6d4, 0x0000119c, 0x000000c4,
-	0x037216a0, 0x00802020, 0x6c4000e2, 0x7ec84d2e, 0x31395d5e,
-	0x00000000, 0x00021f9c, 0x000003ce, 0x00000021, 0x02291e27,
-	0x50302012, 0x0001a000, 0x000037c0, 0x00000004, 0x0000000b,
-	0x00000fff, 0xffb81018, 0x00000108, 0x00000898, 0x02020002,
-	0x01000e0e, 0x3a021501, 0x00000e0e, 0x0000000b, 0x00000150,
-	0x00000110, 0x00022222, 0x00158d18, 0x00071982, 0xf999a83a,
-	0x00000000, 0x0000019c, 0x00800000, 0x00000000, 0x0000019c,
-	0x000001ce, 0x00000150, 0x0000019c, 0x00800000, 0x00000000,
-	0x0000019c, 0x000001ce, 0x00000150
+	0x037216a0, 0x001c2020, 0x6c4000e2, 0x7ec84d2e, 0x33795d5e,
+	0x00000000, 0x00021f9c, 0x000003ce, 0x00000021, 0xcf946222,
+	0x02291e27, 0x50302012, 0x0001a000, 0x000037c0, 0x00000004,
+	0x0000000b, 0x00000fff, 0xffb81018, 0x00000108, 0x00000898,
+	0x02020002, 0x01000e0e, 0x3a021501, 0x00000e0e, 0x0000000b,
+	0x00000150, 0x00000110, 0x00022222, 0x00158d18, 0x00071982,
+	0x7999a83a, 0x00000000, 0x0000019c, 0x001c0000, 0x00000000,
+	0x0000019c, 0x000001ce, 0x00000150, 0x0000019c, 0x001c0000,
+	0x00000000, 0x0000019c, 0x000001ce, 0x00000150
 };
 
 static const uint16_t ar9380_2_2_cm_regs[] = {
@@ -424,8 +424,7 @@ static const uint16_t ar9380_2_2_cm_regs[] = {
 	P(0x08108), P(0x0810c), P(0x08110), P(0x08114), P(0x08118),
 	P(0x0811c), 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(0x081c0), P(0x081c4), P(0x081c8), P(0x081cc), P(0x081d4),
+	P(0x0816c), P(0x081c0), P(0x081c4), P(0x081c8), P(0x081cc),
 	P(0x081ec), P(0x081f0), P(0x081f4), P(0x081f8), P(0x081fc),
 	P(0x08240), P(0x08244), P(0x08248), P(0x0824c), P(0x08250),
 	P(0x08254), P(0x08258), P(0x0825c), P(0x08260), P(0x08264),
@@ -447,11 +446,10 @@ static const uint16_t ar9380_2_2_cm_regs[] = {
 	P(0x09c18), P(0x09c1c), P(0x09d00), P(0x09d04), P(0x09d08),
 	P(0x09d0c), P(0x09d10), P(0x09d14), P(0x09d18), P(0x09e08),
 	P(0x09e24), P(0x09e28), P(0x09e30), P(0x09e34), P(0x09e38),
-	P(0x09e3c), P(0x09e40), P(0x09e4c), P(0x09e50), P(0x09e54),
-	P(0x09fc0), P(0x09fc4), P(0x09fcc), P(0x09fd0), P(0x0a20c),
-	P(0x0a220), P(0x0a224), P(0x0a228), P(0x0a22c), P(0x0a23c),
-	P(0x0a244), P(0x0a2a0), P(0x0a2c0), P(0x0a2c8), P(0x0a2cc),
-	P(0x0a2d4), P(0x0a2dc), P(0x0a2e0), P(0x0a2e4), P(0x0a2e8),
+	P(0x09e40), P(0x09e4c), P(0x09e50), P(0x09e54), P(0x09fc0),
+	P(0x09fc4), P(0x09fcc), P(0x09fd0), P(0x0a20c), P(0x0a220),
+	P(0x0a224), P(0x0a228), P(0x0a22c), P(0x0a23c), P(0x0a244),
+	P(0x0a2a0), P(0x0a2c0), P(0x0a2c8), P(0x0a2cc), P(0x0a2d4),
 	P(0x0a2ec), P(0x0a2f0), P(0x0a2f4), P(0x0a2f8), P(0x0a344),
 	P(0x0a34c), P(0x0a350), P(0x0a364), P(0x0a370), P(0x0a390),
 	P(0x0a394), P(0x0a398), P(0x0a39c), P(0x0a3a0), P(0x0a3a4),
@@ -462,49 +460,45 @@ static const uint16_t ar9380_2_2_cm_regs[] = {
 	P(0x0a408), P(0x0a40c), P(0x0a414), P(0x0a418), P(0x0a41c),
 	P(0x0a420), P(0x0a424), P(0x0a428), P(0x0a42c), P(0x0a430),
 	P(0x0a434), P(0x0a438), P(0x0a43c), P(0x0a440), P(0x0a444),
-	P(0x0a448), P(0x0a44c), P(0x0a450), P(0x0a458), P(0x0a600),
-	P(0x0a604), P(0x0a608), P(0x0a60c), P(0x0a610), P(0x0a614),
-	P(0x0a618), P(0x0a61c), P(0x0a620), P(0x0a624), P(0x0a628),
-	P(0x0a62c), P(0x0a630), P(0x0a634), P(0x0a638), P(0x0a63c),
-	P(0x0a640), P(0x0a644), P(0x0a648), P(0x0a64c), P(0x0a670),
-	P(0x0a674), P(0x0a678), P(0x0a67c), P(0x0a680), P(0x0a684),
-	P(0x0a688), P(0x0a690), P(0x0a7c0), P(0x0a7c4), P(0x0a7c8),
-	P(0x0a7cc), P(0x0a7d0), P(0x0a7d4), P(0x0a7dc), P(0x0a8d0),
-	P(0x0a8d4), P(0x0a8dc), P(0x0a8f0), P(0x0a8f4), P(0x0b2d0),
-	P(0x0b2d4), P(0x0b2dc), P(0x0b2e0), P(0x0b2e4), P(0x0b2e8),
+	P(0x0a448), P(0x0a44c), P(0x0a450), P(0x0a458), P(0x0a640),
+	P(0x0a644), P(0x0a648), P(0x0a64c), P(0x0a670), P(0x0a674),
+	P(0x0a678), P(0x0a67c), P(0x0a680), P(0x0a684), P(0x0a688),
+	P(0x0a690), P(0x0a7c0), P(0x0a7c4), P(0x0a7c8), P(0x0a7cc),
+	P(0x0a7d0), P(0x0a7d4), P(0x0a7dc), P(0x0a8d0), P(0x0a8d4),
+	P(0x0a8dc), P(0x0a8f0), P(0x0a8f4), P(0x0b2d0), P(0x0b2d4),
 	P(0x0b2ec), P(0x0b2f0), P(0x0b2f4), P(0x0b2f8), P(0x0b408),
 	P(0x0b40c), P(0x0b420), P(0x0b8d0), P(0x0b8d4), P(0x0b8dc),
-	P(0x0b8f0), P(0x0b8f4), P(0x0c2d0), P(0x0c2d4), P(0x0c2dc),
-	P(0x0c2e0), P(0x0c2e4), P(0x0c2e8), P(0x0c2ec), P(0x0c2f0),
-	P(0x0c2f4), P(0x0c2f8), P(0x0c408), P(0x0c40c), P(0x0c420),
-	P(0x16000), P(0x16004), P(0x16008), P(0x1600c), P(0x16040),
-	P(0x1604c), P(0x16050), P(0x16054), P(0x16058), P(0x1605c),
-	P(0x16060), P(0x16064), P(0x1606c), P(0x16080), P(0x16084),
-	P(0x16088), P(0x1608c), P(0x16090), P(0x16098), P(0x160a0),
-	P(0x160a4), P(0x160a8), P(0x160b4), P(0x160c0), P(0x160c4),
-	P(0x160c8), P(0x160cc), P(0x16100), P(0x16104), P(0x16108),
-	P(0x16144), P(0x16148), P(0x16280), P(0x16284), P(0x16288),
-	P(0x1628c), P(0x16290), P(0x16294), P(0x16380), P(0x16384),
-	P(0x16388), P(0x1638c), P(0x16390), P(0x16394), P(0x16398),
-	P(0x1639c), P(0x163a0), P(0x163a4), P(0x163a8), P(0x163ac),
-	P(0x163b0), P(0x163b4), P(0x163b8), P(0x163bc), P(0x163c0),
-	P(0x163c4), P(0x163c8), P(0x163cc), P(0x163d0), P(0x163d4),
-	P(0x16400), P(0x16404), P(0x16408), P(0x1640c), P(0x16440),
-	P(0x1644c), P(0x16450), P(0x16454), P(0x16458), P(0x1645c),
-	P(0x16460), P(0x16464), P(0x1646c), P(0x16500), P(0x16504),
-	P(0x16508), P(0x16544), P(0x16548), P(0x16780), P(0x16784),
-	P(0x16788), P(0x1678c), P(0x16790), P(0x16794), P(0x16798),
-	P(0x1679c), P(0x167a0), P(0x167a4), P(0x167a8), P(0x167ac),
-	P(0x167b0), P(0x167b4), P(0x167b8), P(0x167bc), P(0x167c0),
-	P(0x167c4), P(0x167c8), P(0x167cc), P(0x167d0), P(0x167d4),
-	P(0x16800), P(0x16804), P(0x16808), P(0x1680c), P(0x16840),
-	P(0x1684c), P(0x16850), P(0x16854), P(0x16858), P(0x1685c),
-	P(0x16860), P(0x16864), P(0x1686c), P(0x16900), P(0x16904),
-	P(0x16908), P(0x16944), P(0x16948), P(0x16b80), P(0x16b84),
-	P(0x16b88), P(0x16b8c), P(0x16b90), P(0x16b94), P(0x16b98),
-	P(0x16b9c), P(0x16ba0), P(0x16ba4), P(0x16ba8), P(0x16bac),
-	P(0x16bb0), P(0x16bb4), P(0x16bb8), P(0x16bbc), P(0x16bc0),
-	P(0x16bc4), P(0x16bc8), P(0x16bcc), P(0x16bd0), P(0x16bd4)
+	P(0x0b8f0), P(0x0b8f4), P(0x0c2d0), P(0x0c2d4), P(0x0c2ec),
+	P(0x0c2f0), P(0x0c2f4), P(0x0c2f8), P(0x0c408), P(0x0c40c),
+	P(0x0c420), P(0x16000), P(0x16004), P(0x16008), P(0x1600c),
+	P(0x16040), P(0x1604c), P(0x16050), P(0x16054), P(0x16058),
+	P(0x1605c), P(0x16060), P(0x16064), P(0x1606c), P(0x16080),
+	P(0x16084), P(0x16088), P(0x1608c), P(0x16090), P(0x16098),
+	P(0x160a0), P(0x160a4), P(0x160a8), P(0x160b4), P(0x160c0),
+	P(0x160c4), P(0x160c8), P(0x160cc), P(0x16100), P(0x16104),
+	P(0x16108), P(0x16144), P(0x16148), P(0x16280), P(0x16284),
+	P(0x16288), P(0x1628c), P(0x16290), P(0x16294), P(0x16380),
+	P(0x16384), P(0x16388), P(0x1638c), P(0x16390), P(0x16394),
+	P(0x16398), P(0x1639c), P(0x163a0), P(0x163a4), P(0x163a8),
+	P(0x163ac), P(0x163b0), P(0x163b4), P(0x163b8), P(0x163bc),
+	P(0x163c0), P(0x163c4), P(0x163c8), P(0x163cc), P(0x163d0),
+	P(0x163d4), P(0x16400), P(0x16404), P(0x16408), P(0x1640c),
+	P(0x16440), P(0x1644c), P(0x16450), P(0x16454), P(0x16458),
+	P(0x1645c), P(0x16460), P(0x16464), P(0x1646c), P(0x16500),
+	P(0x16504), P(0x16508), P(0x16544), P(0x16548), P(0x16780),
+	P(0x16784), P(0x16788), P(0x1678c), P(0x16790), P(0x16794),
+	P(0x16798), P(0x1679c), P(0x167a0), P(0x167a4), P(0x167a8),
+	P(0x167ac), P(0x167b0), P(0x167b4), P(0x167b8), P(0x167bc),
+	P(0x167c0), P(0x167c4), P(0x167c8), P(0x167cc), P(0x167d0),
+	P(0x167d4), P(0x16800), P(0x16804), P(0x16808), P(0x1680c),
+	P(0x16840), P(0x1684c), P(0x16850), P(0x16854), P(0x16858),
+	P(0x1685c), P(0x16860), P(0x16864), P(0x1686c), P(0x16900),
+	P(0x16904), P(0x16908), P(0x16944), P(0x16948), P(0x16b80),
+	P(0x16b84), P(0x16b88), P(0x16b8c), P(0x16b90), P(0x16b94),
+	P(0x16b98), P(0x16b9c), P(0x16ba0), P(0x16ba4), P(0x16ba8),
+	P(0x16bac), P(0x16bb0), P(0x16bb4), P(0x16bb8), P(0x16bbc),
+	P(0x16bc0), P(0x16bc4), P(0x16bc8), P(0x16bcc), P(0x16bd0),
+	P(0x16bd4)
 };
 
 static const uint32_t ar9380_2_2_cm_vals[] = {
@@ -526,8 +520,7 @@ static const uint32_t ar9380_2_2_cm_vals[] = {
 	0x00000052, 0x00000000, 0x00000000, 0x000007ff, 0x000000aa,
 	0x00003210, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x0000ffff, 0xffffffff, 0x00000000,
-	0x00000000, 0x18486200, 0x33332210, 0x00000000, 0x00020000,
-	0x00000000, 0x33332210, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x33332210, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00100000, 0x0010f424, 0x00000800, 0x0001e848, 0x00000000,
 	0x00000000, 0x00000000, 0x40000000, 0x00080922, 0x9bc00010,
@@ -542,18 +535,17 @@ static const uint32_t ar9380_2_2_cm_vals[] = {
 	0x000f0c00, 0x33332210, 0x33332210, 0x33332210, 0x33332210,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000200,
 	0x000301ff, 0xafe68e30, 0xfd14e000, 0x9c0a9f6b, 0x04900000,
-	0x9280c00a, 0x00000000, 0x00020028, 0x5f3ca3de, 0x0108ecff,
-	0x14750600, 0x201fff00, 0x00001042, 0x00200400, 0x52440bbe,
+	0x9280c00a, 0x00000000, 0x00020028, 0x6400a290, 0x0108ecff,
+	0x14750600, 0x201fff00, 0x00001042, 0x00200400, 0x32840bbe,
 	0x004b6a8e, 0x00000820, 0x00000000, 0x00000000, 0x00000000,
 	0xff55ff55, 0x0320ff55, 0x00000000, 0x00000000, 0x00046384,
 	0x05b6b440, 0x00b6b440, 0xc080a333, 0x40206c10, 0x009c4060,
 	0x9883800a, 0x01834061, 0x00c0040b, 0x00000000, 0x0038230c,
 	0x990bb515, 0x0c6f0000, 0x06336f77, 0x6af6532f, 0x0cc80c00,
-	0xcf946222, 0x0d261820, 0x00001004, 0x00ff03f1, 0x00000000,
-	0x803e4788, 0x0001efb5, 0x40000014, 0x01193b93, 0x00000000,
-	0x00000000, 0x00000000, 0x10002310, 0x01036a1e, 0x00000000,
-	0x0c000000, 0x00000001, 0x00000001, 0x00000000, 0x18c43433,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x0d261820, 0x00001004, 0x00ff03f1, 0x00000000, 0x803e4788,
+	0x0001efb5, 0x40000014, 0x01193b93, 0x00000000, 0x00000000,
+	0x00000000, 0x10002310, 0x01036a27, 0x00000000, 0x0c000000,
+	0x00000001, 0x00000001, 0x00000000, 0x18c43433, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x0000a000, 0x00000000, 0x00000000, 0x00000001,
 	0x00000444, 0x001f0e0f, 0x0075393f, 0xb79f6427, 0x00000000,
@@ -563,50 +555,46 @@ static const uint32_t ar9380_2_2_cm_vals[] = {
 	0x00000246, 0x0cdbd380, 0x000f0f01, 0x8fa91f01, 0x00000000,
 	0x0e79e5c6, 0x00820820, 0x1ce739ce, 0x2d001dce, 0x1ce739ce,
 	0x000001ce, 0x1ce739ce, 0x000001ce, 0x1ce739ce, 0x1ce739ce,
-	0x00000000, 0x00001801, 0x00000000, 0x00000000, 0x00000000,
+	0x00000000, 0x00001801, 0x00100000, 0x00000000, 0x00000000,
 	0x06000080, 0x00000001, 0x00010000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x3fad9d74, 0x0048060a, 0x00000637, 0x03020100,
-	0x09080504, 0x0d0c0b0a, 0x13121110, 0x31301514, 0x35343332,
-	0x00000036, 0x00000838, 0x00000000, 0xfffffffc, 0x00000000,
-	0x00000000, 0x00000000, 0x00000004, 0x00000001, 0x004b6a8e,
-	0x00000820, 0x00000000, 0x00000000, 0x00000000, 0x00000080,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x3fad9d74, 0x0048060a, 0x00003c37, 0x03020100, 0x09080504,
+	0x0d0c0b0a, 0x13121110, 0x31301514, 0x35343332, 0x00000036,
+	0x00000838, 0x00000000, 0xfffffffc, 0x00000000, 0x00000000,
+	0x00000000, 0x00000004, 0x00000001, 0x004b6a8e, 0x00000820,
+	0x00000000, 0x00000000, 0x00000000, 0x00000080, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0e79e5c0,
 	0x00820820, 0x00000000, 0x004b6a8e, 0x00000820, 0x00000000,
 	0x00000000, 0x00000000, 0x00000080, 0x00000000, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x0e79e5c0, 0x00820820,
+	0x00000000, 0x36db6db6, 0x6db6db40, 0x73f00000, 0x00000000,
+	0x7f80fff8, 0x76d005b5, 0x556cf031, 0x13449440, 0x0c51c92c,
+	0x3db7fffc, 0xfffffffc, 0x000f0278, 0x6db60000, 0x00000000,
+	0x0e48048c, 0x54214514, 0x119f481e, 0x24926490, 0xd2888888,
+	0x0a108ffe, 0x812fc370, 0x423c8000, 0x92480080, 0x00adb6d0,
+	0x6db6db60, 0x6db6db6c, 0x01e6c000, 0x3fffbe01, 0xfff80000,
+	0x00080010, 0x02084080, 0x00000000, 0x058a0001, 0x3d840208,
+	0x05a20408, 0x00038c07, 0x00000004, 0x458aa14f, 0x00000000,
+	0x00000000, 0x00800700, 0x00800700, 0x00800700, 0x00000000,
+	0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x0e79e5c0, 0x00820820, 0x00000000,
-	0x36db6db6, 0x6db6db40, 0x73f00000, 0x00000000, 0x7f80fff8,
-	0x76d005b5, 0x556cf031, 0x13449440, 0x0c51c92c, 0x3db7fffc,
-	0xfffffffc, 0x000f0278, 0x6db60000, 0x00000000, 0x0e48048c,
-	0x54214514, 0x119f481e, 0x24926490, 0xd2888888, 0x0a108ffe,
-	0x812fc370, 0x423c8000, 0x92480080, 0x00adb6d0, 0x6db6db60,
-	0x6db6db6c, 0x01e6c000, 0x3fffbe01, 0xfff80000, 0x00080010,
-	0x02084080, 0x00000000, 0x058a0001, 0x3d840208, 0x05a20408,
-	0x00038c07, 0x00000004, 0x458aa14f, 0x00000000, 0x00000000,
-	0x00800700, 0x00800700, 0x00800700, 0x00000000, 0x00000000,
-	0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000a0,
-	0x000c0000, 0x14021402, 0x00001402, 0x00000000, 0x00000000,
-	0x36db6db6, 0x6db6db40, 0x73f00000, 0x00000000, 0x7f80fff8,
-	0x76d005b5, 0x556cf031, 0x13449440, 0x0c51c92c, 0x3db7fffc,
-	0xfffffffc, 0x000f0278, 0x6db60000, 0x3fffbe01, 0xfff80000,
-	0x00080010, 0x02084080, 0x00000000, 0x00000000, 0x00000000,
-	0x00800700, 0x00800700, 0x00800700, 0x00000000, 0x00000000,
-	0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000a0,
-	0x000c0000, 0x14021402, 0x00001402, 0x00000000, 0x00000000,
-	0x36db6db6, 0x6db6db40, 0x73f00000, 0x00000000, 0x7f80fff8,
-	0x76d005b5, 0x556cf031, 0x13449440, 0x0c51c92c, 0x3db7fffc,
-	0xfffffffc, 0x000f0278, 0x6db60000, 0x3fffbe01, 0xfff80000,
-	0x00080010, 0x02084080, 0x00000000, 0x00000000, 0x00000000,
-	0x00800700, 0x00800700, 0x00800700, 0x00000000, 0x00000000,
-	0x00000000, 0x00000001, 0x00000001, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x000000a0,
-	0x000c0000, 0x14021402, 0x00001402, 0x00000000, 0x00000000
+	0x000000a0, 0x000c0000, 0x14021402, 0x00001402, 0x00000000,
+	0x00000000, 0x36db6db6, 0x6db6db40, 0x73f00000, 0x00000000,
+	0x7f80fff8, 0x76d005b5, 0x556cf031, 0x13449440, 0x0c51c92c,
+	0x3db7fffc, 0xfffffffc, 0x000f0278, 0x6db60000, 0x3fffbe01,
+	0xfff80000, 0x00080010, 0x02084080, 0x00000000, 0x00000000,
+	0x00000000, 0x00800700, 0x00800700, 0x00800700, 0x00000000,
+	0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x000000a0, 0x000c0000, 0x14021402, 0x00001402, 0x00000000,
+	0x00000000, 0x36db6db6, 0x6db6db40, 0x73f00000, 0x00000000,
+	0x7f80fff8, 0x76d005b5, 0x556cf031, 0x13449440, 0x0c51c92c,
+	0x3db7fffc, 0xfffffffc, 0x000f0278, 0x6db60000, 0x3fffbe01,
+	0xfff80000, 0x00080010, 0x02084080, 0x00000000, 0x00000000,
+	0x00000000, 0x00800700, 0x00800700, 0x00800700, 0x00000000,
+	0x00000000, 0x00000000, 0x00000001, 0x00000001, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
+	0x000000a0, 0x000c0000, 0x14021402, 0x00001402, 0x00000000,
+	0x00000000
 };
 
 static const uint16_t ar9380_2_2_fast_clock_regs[] = {
@@ -616,13 +604,13 @@ static const uint16_t ar9380_2_2_fast_clock_regs[] = {
 
 static const uint32_t ar9380_2_2_fast_clock_vals_5g20[] = {
 	0x00000268, 0x0000018c, 0x00000fd0, 0x044c044c, 0x148ec02b,
-	0x000044c0, 0x03721821, 0x0000000b, 0x00000898
+	0x000044c0, 0x0372131c, 0x0000000b, 0x00000898
 };
 
 #ifndef IEEE80211_NO_HT
 static const uint32_t ar9380_2_2_fast_clock_vals_5g40[] = {
 	0x000004d0, 0x00000318, 0x00001fa0, 0x08980898, 0x148ec057,
-	0x00008980, 0x03721821, 0x00000016, 0x00001130
+	0x00008980, 0x0372131c, 0x00000016, 0x00001130
 };
 #endif
 
@@ -650,57 +638,75 @@ static const struct athn_ini ar9380_2_2_ini = {
  * AR9380 2.2 Tx gains.
  */
 static const uint16_t ar9380_2_2_tx_gain_regs[] = {
-	P(0x0a410), P(0x0a500), P(0x0a504), P(0x0a508), P(0x0a50c),
-	P(0x0a510), P(0x0a514), P(0x0a518), P(0x0a51c), P(0x0a520),
-	P(0x0a524), P(0x0a528), P(0x0a52c), P(0x0a530), P(0x0a534),
-	P(0x0a538), P(0x0a53c), P(0x0a540), P(0x0a544), P(0x0a548),
-	P(0x0a54c), P(0x0a550), P(0x0a554), P(0x0a558), P(0x0a55c),
-	P(0x0a560), P(0x0a564), P(0x0a568), P(0x0a56c), P(0x0a570),
-	P(0x0a574), P(0x0a578), P(0x0a57c), P(0x0a580), P(0x0a584),
-	P(0x0a588), P(0x0a58c), P(0x0a590), P(0x0a594), P(0x0a598),
-	P(0x0a59c), P(0x0a5a0), P(0x0a5a4), P(0x0a5a8), P(0x0a5ac),
-	P(0x0a5b0), P(0x0a5b4), P(0x0a5b8), P(0x0a5bc), P(0x0a5c0),
-	P(0x0a5c4), P(0x0a5c8), P(0x0a5cc), P(0x0a5d0), P(0x0a5d4),
-	P(0x0a5d8), P(0x0a5dc), P(0x0a5e0), P(0x0a5e4), P(0x0a5e8),
-	P(0x0a5ec), P(0x0a5f0), P(0x0a5f4), P(0x0a5f8), P(0x0a5fc),
-	P(0x16044), P(0x16048), P(0x16068), P(0x16444), P(0x16448),
-	P(0x16468), P(0x16844), P(0x16848), P(0x16868)
+	P(0x0a2dc), P(0x0a2e0), P(0x0a2e4), P(0x0a2e8), P(0x0a410),
+	P(0x0a500), P(0x0a504), P(0x0a508), P(0x0a50c), P(0x0a510),
+	P(0x0a514), P(0x0a518), P(0x0a51c), P(0x0a520), P(0x0a524),
+	P(0x0a528), P(0x0a52c), P(0x0a530), P(0x0a534), P(0x0a538),
+	P(0x0a53c), P(0x0a540), P(0x0a544), P(0x0a548), P(0x0a54c),
+	P(0x0a550), P(0x0a554), P(0x0a558), P(0x0a55c), P(0x0a560),
+	P(0x0a564), P(0x0a568), P(0x0a56c), P(0x0a570), P(0x0a574),
+	P(0x0a578), P(0x0a57c), P(0x0a580), P(0x0a584), P(0x0a588),
+	P(0x0a58c), P(0x0a590), P(0x0a594), P(0x0a598), P(0x0a59c),
+	P(0x0a5a0), P(0x0a5a4), P(0x0a5a8), P(0x0a5ac), P(0x0a5b0),
+	P(0x0a5b4), P(0x0a5b8), P(0x0a5bc), P(0x0a5c0), P(0x0a5c4),
+	P(0x0a5c8), P(0x0a5cc), P(0x0a5d0), P(0x0a5d4), P(0x0a5d8),
+	P(0x0a5dc), P(0x0a5e0), P(0x0a5e4), P(0x0a5e8), P(0x0a5ec),
+	P(0x0a5f0), P(0x0a5f4), P(0x0a5f8), P(0x0a5fc), P(0x0a600),
+	P(0x0a604), P(0x0a608), P(0x0a60c), P(0x0a610), P(0x0a614),
+	P(0x0a618), P(0x0a61c), P(0x0a620), P(0x0a624), P(0x0a628),
+	P(0x0a62c), P(0x0a630), P(0x0a634), P(0x0a638), P(0x0a63c),
+	P(0x0b2dc), P(0x0b2e0), P(0x0b2e4), P(0x0b2e8), P(0x0c2dc),
+	P(0x0c2e0), P(0x0c2e4), P(0x0c2e8), P(0x16044), P(0x16048),
+	P(0x16068), P(0x16444), P(0x16448), P(0x16468), P(0x16844),
+	P(0x16848), P(0x16868)
 };
 
 static const uint32_t ar9380_2_2_tx_gain_vals_5g[] = {
-	0x000050d9, 0x00000000, 0x06000003, 0x0a000020, 0x10000023,
-	0x16000220, 0x1c000223, 0x21002220, 0x27002223, 0x2b022220,
-	0x2f022222, 0x34022225, 0x3a02222a, 0x3e02222c, 0x4202242a,
-	0x4702244a, 0x4b02244c, 0x4e02246c, 0x5302266c, 0x5702286c,
-	0x5c02486b, 0x61024a6c, 0x66026a6c, 0x6b026e6c, 0x7002708c,
-	0x7302b08a, 0x7702b08c, 0x7702b08c, 0x7702b08c, 0x7702b08c,
-	0x7702b08c, 0x7702b08c, 0x7702b08c, 0x00800000, 0x06800003,
-	0x0a800020, 0x10800023, 0x16800220, 0x1c800223, 0x21802220,
-	0x27802223, 0x2b822220, 0x2f822222, 0x34822225, 0x3a82222a,
-	0x3e82222c, 0x4282242a, 0x4782244a, 0x4b82244c, 0x4e82246c,
-	0x5382266c, 0x5782286c, 0x5c82486b, 0x61824a6c, 0x66826a6c,
-	0x6b826e6c, 0x7082708c, 0x7382b08a, 0x7782b08c, 0x7782b08c,
-	0x7782b08c, 0x7782b08c, 0x7782b08c, 0x7782b08c, 0x7782b08c,
-	0x012492d4, 0x62480001, 0x6db6db6c, 0x012492d4, 0x62480001,
-	0x6db6db6c, 0x012492d4, 0x62480001, 0x6db6db6c
+	0x0380c7fc, 0x0000f800, 0x03ff0000, 0x00000000, 0x000050d9,
+	0x00000000, 0x06000003, 0x0a000020, 0x10000023, 0x16000220,
+	0x1c000223, 0x21002220, 0x27002223, 0x2b022220, 0x2f022222,
+	0x34022225, 0x3a02222a, 0x3e02222c, 0x4202242a, 0x4702244a,
+	0x4b02244c, 0x4e02246c, 0x5302266c, 0x5702286c, 0x5c02486b,
+	0x61024a6c, 0x66026a6c, 0x6b026e6c, 0x7002708c, 0x7302b08a,
+	0x7702b08c, 0x7702b08c, 0x7702b08c, 0x7702b08c, 0x7702b08c,
+	0x7702b08c, 0x7702b08c, 0x00800000, 0x06800003, 0x0a800020,
+	0x10800023, 0x16800220, 0x1c800223, 0x21802220, 0x27802223,
+	0x2b822220, 0x2f822222, 0x34822225, 0x3a82222a, 0x3e82222c,
+	0x4282242a, 0x4782244a, 0x4b82244c, 0x4e82246c, 0x5382266c,
+	0x5782286c, 0x5c82486b, 0x61824a6c, 0x66826a6c, 0x6b826e6c,
+	0x7082708c, 0x7382b08a, 0x7782b08c, 0x7782b08c, 0x7782b08c,
+	0x7782b08c, 0x7782b08c, 0x7782b08c, 0x7782b08c, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01404000,
+	0x01404501, 0x02008802, 0x0300cc03, 0x0300cc03, 0x0300cc03,
+	0x03810c03, 0x03810e04, 0x03810e04, 0x03810e04, 0x03810e04,
+	0x0380c7fc, 0x0000f800, 0x03ff0000, 0x00000000, 0x0380c7fc,
+	0x0000f800, 0x03ff0000, 0x00000000, 0x012492d4, 0x62480001,
+	0x6db6db6c, 0x012492d4, 0x62480001, 0x6db6db6c, 0x012492d4,
+	0x62480001, 0x6db6db6c
 };
 
 static const uint32_t ar9380_2_2_tx_gain_vals_2g[] = {
-	0x000050d9, 0x00000000, 0x04000002, 0x08000004, 0x0b000200,
-	0x0f000202, 0x12000400, 0x16000402, 0x19000404, 0x1c000603,
-	0x21000a02, 0x25000a04, 0x28000a20, 0x2c000e20, 0x30000e22,
-	0x34000e24, 0x38001640, 0x3c001660, 0x3f001861, 0x43001a81,
-	0x47001a83, 0x4a001c84, 0x4e001ce3, 0x52001ce5, 0x56001ce9,
-	0x5a001ceb, 0x5d001eec, 0x5d001eec, 0x5d001eec, 0x5d001eec,
-	0x5d001eec, 0x5d001eec, 0x5d001eec, 0x00800000, 0x04800002,
-	0x08800004, 0x0b800200, 0x0f800202, 0x12800400, 0x16800402,
-	0x19800404, 0x1c800603, 0x21800a02, 0x25800a04, 0x28800a20,
-	0x2c800e20, 0x30800e22, 0x34800e24, 0x38801640, 0x3c801660,
-	0x3f801861, 0x43801a81, 0x47801a83, 0x4a801c84, 0x4e801ce3,
-	0x52801ce5, 0x56801ce9, 0x5a801ceb, 0x5d801eec, 0x5d801eec,
-	0x5d801eec, 0x5d801eec, 0x5d801eec, 0x5d801eec, 0x5d801eec,
-	0x012492d4, 0x62480001, 0x6db6db6c, 0x012492d4, 0x62480001,
-	0x6db6db6c, 0x012492d4, 0x62480001, 0x6db6db6c
+	0x00637800, 0x03838000, 0x03fc0000, 0x00000000, 0x000050d9,
+	0x00000000, 0x04000002, 0x08000004, 0x0b000200, 0x0f000202,
+	0x12000400, 0x16000402, 0x19000404, 0x1c000603, 0x21000a02,
+	0x25000a04, 0x28000a20, 0x2c000e20, 0x30000e22, 0x34000e24,
+	0x38001640, 0x3c001660, 0x3f001861, 0x43001a81, 0x47001a83,
+	0x4a001c84, 0x4e001ce3, 0x52001ce5, 0x56001ce9, 0x5a001ceb,
+	0x5d001eec, 0x5d001eec, 0x5d001eec, 0x5d001eec, 0x5d001eec,
+	0x5d001eec, 0x5d001eec, 0x00800000, 0x04800002, 0x08800004,
+	0x0b800200, 0x0f800202, 0x12800400, 0x16800402, 0x19800404,
+	0x1c800603, 0x21800a02, 0x25800a04, 0x28800a20, 0x2c800e20,
+	0x30800e22, 0x34800e24, 0x38801640, 0x3c801660, 0x3f801861,
+	0x43801a81, 0x47801a83, 0x4a801c84, 0x4e801ce3, 0x52801ce5,
+	0x56801ce9, 0x5a801ceb, 0x5d801eec, 0x5d801eec, 0x5d801eec,
+	0x5d801eec, 0x5d801eec, 0x5d801eec, 0x5d801eec, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01404000,
+	0x01404501, 0x02008501, 0x0280ca03, 0x03010c04, 0x04014c04,
+	0x04015005, 0x04015005, 0x04015005, 0x04015005, 0x04015005,
+	0x00637800, 0x03838000, 0x03fc0000, 0x00000000, 0x00637800,
+	0x03838000, 0x03fc0000, 0x00000000, 0x012492d4, 0x62480001,
+	0x6db6db6c, 0x012492d4, 0x62480001, 0x6db6db6c, 0x012492d4,
+	0x62480001, 0x6db6db6c
 };
 
 static const struct athn_gain ar9380_2_2_tx_gain = {
@@ -714,39 +720,51 @@ static const struct athn_gain ar9380_2_2_tx_gain = {
  * AR9380 2.2 high ob/db Tx gains.
  */
 static const uint32_t ar9380_2_2_tx_gain_high_ob_db_vals_5g[] = {
-	0x000050d8, 0x00002220, 0x04002222, 0x09002421, 0x0d002621,
-	0x13004620, 0x19004a20, 0x1d004e20, 0x21005420, 0x26005e20,
-	0x2b005e40, 0x2f005e42, 0x33005e44, 0x38005e65, 0x3c005e69,
-	0x40005e6b, 0x44005e6d, 0x49005e72, 0x4e005eb2, 0x53005f12,
-	0x59025eb5, 0x5e025f12, 0x61027f12, 0x6702bf12, 0x6b02bf14,
+	0x01feee00, 0x0000f000, 0x01ff0000, 0x00000000, 0x000050d8,
+	0x00002220, 0x04002222, 0x09002421, 0x0d002621, 0x13004620,
+	0x19004a20, 0x1d004e20, 0x21005420, 0x26005e20, 0x2b005e40,
+	0x2f005e42, 0x33005e44, 0x38005e65, 0x3c005e69, 0x40005e6b,
+	0x44005e6d, 0x49005e72, 0x4e005eb2, 0x53005f12, 0x59025eb2,
+	0x5e025f12, 0x61027f12, 0x6702bf12, 0x6b02bf14, 0x6f02bf16,
 	0x6f02bf16, 0x6f02bf16, 0x6f02bf16, 0x6f02bf16, 0x6f02bf16,
-	0x6f02bf16, 0x6f02bf16, 0x6f02bf16, 0x00802220, 0x04802222,
-	0x09802421, 0x0d802621, 0x13804620, 0x19804a20, 0x1d804e20,
-	0x21805420, 0x26805e20, 0x2b805e40, 0x2f805e42, 0x33805e44,
-	0x38805e65, 0x3c805e69, 0x40805e6b, 0x44805e6d, 0x49805e72,
-	0x4e805eb2, 0x53805f12, 0x59825eb2, 0x5e825f12, 0x61827f12,
-	0x6782bf12, 0x6b82bf14, 0x6f82bf16, 0x6f82bf16, 0x6f82bf16,
-	0x6f82bf16, 0x6f82bf16, 0x6f82bf16, 0x6f82bf16, 0x6f82bf16,
-	0x056db2e4, 0x8e480001, 0x6db6db6c, 0x056db2e4, 0x8e480001,
-	0x6db6db6c, 0x056db2e4, 0x8e480001, 0x6db6db6c
+	0x6f02bf16, 0x6f02bf16, 0x00802220, 0x04802222, 0x09802421,
+	0x0d802621, 0x13804620, 0x19804a20, 0x1d804e20, 0x21805420,
+	0x26805e20, 0x2b805e40, 0x2f805e42, 0x33805e44, 0x38805e65,
+	0x3c805e69, 0x40805e6b, 0x44805e6d, 0x49805e72, 0x4e805eb2,
+	0x53805f12, 0x59825eb2, 0x5e825f12, 0x61827f12, 0x6782bf12,
+	0x6b82bf14, 0x6f82bf16, 0x6f82bf16, 0x6f82bf16, 0x6f82bf16,
+	0x6f82bf16, 0x6f82bf16, 0x6f82bf16, 0x6f82bf16, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00804000, 0x00804201,
+	0x0280c802, 0x0280ca03, 0x04c15104, 0x04c15305, 0x04c15305,
+	0x04c15305, 0x04c15305, 0x04c15305, 0x04c15305, 0x04c15305,
+	0x01feee00, 0x0000f000, 0x01ff0000, 0x00000000, 0x01feee00,
+	0x0000f000, 0x01ff0000, 0x00000000, 0x056db2e4, 0x8e480001,
+	0x6db6db6c, 0x056db2e4, 0x8e480001, 0x6db6db6c, 0x056db2e4,
+	0x8e480001, 0x6db6db6c
 };
 
 static const uint32_t ar9380_2_2_tx_gain_high_ob_db_vals_2g[] = {
-	0x000050d9, 0x00000000, 0x04000002, 0x08000004, 0x0b000200,
-	0x0f000202, 0x11000400, 0x15000402, 0x19000404, 0x1b000603,
-	0x1f000a02, 0x23000a04, 0x26000a20, 0x2a000e20, 0x2e000e22,
-	0x31000e24, 0x34001640, 0x38001660, 0x3b001861, 0x3e001a81,
-	0x42001a83, 0x44001c84, 0x48001ce3, 0x4c001ce5, 0x50001ce9,
-	0x54001ceb, 0x56001eec, 0x56001eec, 0x56001eec, 0x56001eec,
-	0x56001eec, 0x56001eec, 0x56001eec, 0x00800000, 0x04800002,
-	0x08800004, 0x0b800200, 0x0f800202, 0x11800400, 0x15800402,
-	0x19800404, 0x1b800603, 0x1f800a02, 0x23800a04, 0x26800a20,
-	0x2a800e20, 0x2e800e22, 0x31800e24, 0x34801640, 0x38801660,
-	0x3b801861, 0x3e801a81, 0x42801a83, 0x44801c84, 0x48801ce3,
-	0x4c801ce5, 0x50801ce9, 0x54801ceb, 0x56801eec, 0x56801eec,
-	0x56801eec, 0x56801eec, 0x56801eec, 0x56801eec, 0x56801eec,
-	0x056db2e4, 0x8e480001, 0x6db6db6c, 0x056db2e4, 0x8e480001,
-	0x6db6db6c, 0x056db2e4, 0x8e480001, 0x6db6db6c
+	0x00637800, 0x03838000, 0x03fc0000, 0x00000000, 0x000050d9,
+	0x00000000, 0x04000002, 0x08000004, 0x0b000200, 0x0f000202,
+	0x11000400, 0x15000402, 0x19000404, 0x1b000603, 0x1f000a02,
+	0x23000a04, 0x26000a20, 0x2a000e20, 0x2e000e22, 0x31000e24,
+	0x34001640, 0x38001660, 0x3b001861, 0x3e001a81, 0x42001a83,
+	0x44001c84, 0x48001ce3, 0x4c001ce5, 0x50001ce9, 0x54001ceb,
+	0x56001eec, 0x56001eec, 0x56001eec, 0x56001eec, 0x56001eec,
+	0x56001eec, 0x56001eec, 0x00800000, 0x04800002, 0x08800004,
+	0x0b800200, 0x0f800202, 0x11800400, 0x15800402, 0x19800404,
+	0x1b800603, 0x1f800a02, 0x23800a04, 0x26800a20, 0x2a800e20,
+	0x2e800e22, 0x31800e24, 0x34801640, 0x38801660, 0x3b801861,
+	0x3e801a81, 0x42801a83, 0x44801c84, 0x48801ce3, 0x4c801ce5,
+	0x50801ce9, 0x54801ceb, 0x56801eec, 0x56801eec, 0x56801eec,
+	0x56801eec, 0x56801eec, 0x56801eec, 0x56801eec, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01404000,
+	0x01404501, 0x02008501, 0x0280ca03, 0x03010c04, 0x04014c04,
+	0x04015005, 0x04015005, 0x04015005, 0x04015005, 0x04015005,
+	0x00637800, 0x03838000, 0x03fc0000, 0x00000000, 0x00637800,
+	0x03838000, 0x03fc0000, 0x00000000, 0x056db2e4, 0x8e480001,
+	0x6db6db6c, 0x056db2e4, 0x8e480001, 0x6db6db6c, 0x056db2e4,
+	0x8e480001, 0x6db6db6c
 };
 
 static const struct athn_gain ar9380_2_2_tx_gain_high_ob_db = {
@@ -760,39 +778,51 @@ static const struct athn_gain ar9380_2_2_tx_gain_high_ob_db = {
  * AR9380 2.2 low ob/db Tx gains.
  */
 static const uint32_t ar9380_2_2_tx_gain_low_ob_db_vals_5g[] = {
-	0x000050d9, 0x00000000, 0x06000003, 0x0a000020, 0x10000023,
-	0x16000220, 0x1c000223, 0x21002220, 0x27002223, 0x2b022220,
-	0x2f022222, 0x34022225, 0x3a02222a, 0x3e02222c, 0x4202242a,
-	0x4702244a, 0x4b02244c, 0x4e02246c, 0x5302266c, 0x5702286c,
-	0x5c02486b, 0x61024a6c, 0x66026a6c, 0x6b026e6c, 0x7002708c,
-	0x7302b08a, 0x7702b08c, 0x7702b08c, 0x7702b08c, 0x7702b08c,
-	0x7702b08c, 0x7702b08c, 0x7702b08c, 0x00800000, 0x06800003,
-	0x0a800020, 0x10800023, 0x16800220, 0x1c800223, 0x21802220,
-	0x27802223, 0x2b822220, 0x2f822222, 0x34822225, 0x3a82222a,
-	0x3e82222c, 0x4282242a, 0x4782244a, 0x4b82244c, 0x4e82246c,
-	0x5382266c, 0x5782286c, 0x5c82486b, 0x61824a6c, 0x66826a6c,
-	0x6b826e6c, 0x7082708c, 0x7382b08a, 0x7782b08c, 0x7782b08c,
-	0x7782b08c, 0x7782b08c, 0x7782b08c, 0x7782b08c, 0x7782b08c,
-	0x012492d4, 0x66480001, 0x6db6db6c, 0x012492d4, 0x66480001,
-	0x6db6db6c, 0x012492d4, 0x66480001, 0x6db6db6c
+	0x0380c7fc, 0x0000f800, 0x03ff0000, 0x00000000, 0x000050d9,
+	0x00000000, 0x06000003, 0x0a000020, 0x10000023, 0x16000220,
+	0x1c000223, 0x21002220, 0x27002223, 0x2b022220, 0x2f022222,
+	0x34022225, 0x3a02222a, 0x3e02222c, 0x4202242a, 0x4702244a,
+	0x4b02244c, 0x4e02246c, 0x5302266c, 0x5702286c, 0x5c02486b,
+	0x61024a6c, 0x66026a6c, 0x6b026e6c, 0x7002708c, 0x7302b08a,
+	0x7702b08c, 0x7702b08c, 0x7702b08c, 0x7702b08c, 0x7702b08c,
+	0x7702b08c, 0x7702b08c, 0x00800000, 0x06800003, 0x0a800020,
+	0x10800023, 0x16800220, 0x1c800223, 0x21802220, 0x27802223,
+	0x2b822220, 0x2f822222, 0x34822225, 0x3a82222a, 0x3e82222c,
+	0x4282242a, 0x4782244a, 0x4b82244c, 0x4e82246c, 0x5382266c,
+	0x5782286c, 0x5c82486b, 0x61824a6c, 0x66826a6c, 0x6b826e6c,
+	0x7082708c, 0x7382b08a, 0x7782b08c, 0x7782b08c, 0x7782b08c,
+	0x7782b08c, 0x7782b08c, 0x7782b08c, 0x7782b08c, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01404000,
+	0x01404501, 0x02008802, 0x0300cc03, 0x0300cc03, 0x0300cc03,
+	0x03810c03, 0x03810e04, 0x03810e04, 0x03810e04, 0x03810e04,
+	0x0380c7fc, 0x0000f800, 0x03ff0000, 0x00000000, 0x0380c7fc,
+	0x0000f800, 0x03ff0000, 0x00000000, 0x012492d4, 0x66480001,
+	0x6db6db6c, 0x012492d4, 0x66480001, 0x6db6db6c, 0x012492d4,
+	0x66480001, 0x6db6db6c
 };
 
 static const uint32_t ar9380_2_2_tx_gain_low_ob_db_vals_2g[] = {
-	0x000050d9, 0x00000000, 0x04000002, 0x08000004, 0x0b000200,
-	0x0f000202, 0x12000400, 0x16000402, 0x19000404, 0x1c000603,
-	0x21000a02, 0x25000a04, 0x28000a20, 0x2c000e20, 0x30000e22,
-	0x34000e24, 0x38001640, 0x3c001660, 0x3f001861, 0x43001a81,
-	0x47001a83, 0x4a001c84, 0x4e001ce3, 0x52001ce5, 0x56001ce9,
-	0x5a001ceb, 0x5d001eec, 0x5d001eec, 0x5d001eec, 0x5d001eec,
-	0x5d001eec, 0x5d001eec, 0x5d001eec, 0x00800000, 0x04800002,
-	0x08800004, 0x0b800200, 0x0f800202, 0x12800400, 0x16800402,
-	0x19800404, 0x1c800603, 0x21800a02, 0x25800a04, 0x28800a20,
-	0x2c800e20, 0x30800e22, 0x34800e24, 0x38801640, 0x3c801660,
-	0x3f801861, 0x43801a81, 0x47801a83, 0x4a801c84, 0x4e801ce3,
-	0x52801ce5, 0x56801ce9, 0x5a801ceb, 0x5d801eec, 0x5d801eec,
-	0x5d801eec, 0x5d801eec, 0x5d801eec, 0x5d801eec, 0x5d801eec,
-	0x012492d4, 0x66480001, 0x6db6db6c, 0x012492d4, 0x66480001,
-	0x6db6db6c, 0x012492d4, 0x66480001, 0x6db6db6c
+	0x00637800, 0x03838000, 0x03fc0000, 0x00000000, 0x000050d9,
+	0x00000000, 0x04000002, 0x08000004, 0x0b000200, 0x0f000202,
+	0x12000400, 0x16000402, 0x19000404, 0x1c000603, 0x21000a02,
+	0x25000a04, 0x28000a20, 0x2c000e20, 0x30000e22, 0x34000e24,
+	0x38001640, 0x3c001660, 0x3f001861, 0x43001a81, 0x47001a83,
+	0x4a001c84, 0x4e001ce3, 0x52001ce5, 0x56001ce9, 0x5a001ceb,
+	0x5d001eec, 0x5d001eec, 0x5d001eec, 0x5d001eec, 0x5d001eec,
+	0x5d001eec, 0x5d001eec, 0x00800000, 0x04800002, 0x08800004,
+	0x0b800200, 0x0f800202, 0x12800400, 0x16800402, 0x19800404,
+	0x1c800603, 0x21800a02, 0x25800a04, 0x28800a20, 0x2c800e20,
+	0x30800e22, 0x34800e24, 0x38801640, 0x3c801660, 0x3f801861,
+	0x43801a81, 0x47801a83, 0x4a801c84, 0x4e801ce3, 0x52801ce5,
+	0x56801ce9, 0x5a801ceb, 0x5d801eec, 0x5d801eec, 0x5d801eec,
+	0x5d801eec, 0x5d801eec, 0x5d801eec, 0x5d801eec, 0x00000000,
+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x01404000,
+	0x01404501, 0x02008501, 0x0280ca03, 0x03010c04, 0x04014c04,
+	0x04015005, 0x04015005, 0x04015005, 0x04015005, 0x04015005,
+	0x00637800, 0x03838000, 0x03fc0000, 0x00000000, 0x00637800,
+	0x03838000, 0x03fc0000, 0x00000000, 0x012492d4, 0x66480001,
+	0x6db6db6c, 0x012492d4, 0x66480001, 0x6db6db6c, 0x012492d4,
+	0x66480001, 0x6db6db6c
 };
 
 static const struct athn_gain ar9380_2_2_tx_gain_low_ob_db = {
@@ -893,8 +923,8 @@ static const uint32_t ar9380_2_2_rx_gain_vals[] = {
 	0x03920391, 0x03940393, 0x03960395, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x32323232, 0x2f2f3232, 0x23282a2d, 0x1c1e2123, 0x14171919,
-	0x0e0e1214, 0x03050707, 0x00030303, 0x00000000, 0x00000000,
+	0x2a2d2f32, 0x21232328, 0x19191c1e, 0x12141417, 0x07070e0e,
+	0x03030305, 0x00000003, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
 	0x00000000, 0x003f0020, 0x00400041, 0x0140005f, 0x0160015f,
 	0x017e017f, 0x02410242, 0x025f0240, 0x027f0260, 0x0341027e,