From c1f1058a89bfa6827da3edb8ff99b968fe5c66c5 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 9 Jul 2011 04:20:01 +0000
Subject: [PATCH] ath9k: merge some pending initval fixes for ar9380

SVN-Revision: 27566
---
 .../mac80211/patches/300-pending_work.patch   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/package/mac80211/patches/300-pending_work.patch b/package/mac80211/patches/300-pending_work.patch
index adf59f61ae..7e3160a1db 100644
--- a/package/mac80211/patches/300-pending_work.patch
+++ b/package/mac80211/patches/300-pending_work.patch
@@ -1076,3 +1076,43 @@
  		break;
  	case WLAN_CIPHER_SUITE_AES_CMAC:
  		tpn = key->u.aes_cmac.tx_pn;
+--- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
++++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
+@@ -653,8 +653,8 @@ static const u32 ar9300_2p2_baseband_pos
+ 	{0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
+ 	{0x0000a28c, 0x00022222, 0x00022222, 0x00022222, 0x00022222},
+ 	{0x0000a2c4, 0x00158d18, 0x00158d18, 0x00158d18, 0x00158d18},
+-	{0x0000a2d0, 0x00071981, 0x00071981, 0x00071981, 0x00071982},
+-	{0x0000a2d8, 0x7999a83a, 0x7999a83a, 0x7999a83a, 0x7999a83a},
++	{0x0000a2d0, 0x00041981, 0x00041981, 0x00041981, 0x00041982},
++	{0x0000a2d8, 0x7999a83b, 0x7999a83b, 0x7999a83b, 0x7999a83b},
+ 	{0x0000a358, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
+ 	{0x0000a830, 0x0000019c, 0x0000019c, 0x0000019c, 0x0000019c},
+ 	{0x0000ae04, 0x001c0000, 0x001c0000, 0x001c0000, 0x001c0000},
+@@ -761,7 +761,7 @@ static const u32 ar9300_2p2_baseband_cor
+ 	{0x0000a3ec, 0x20202020},
+ 	{0x0000a3f0, 0x00000000},
+ 	{0x0000a3f4, 0x00000246},
+-	{0x0000a3f8, 0x0cdbd380},
++	{0x0000a3f8, 0x0c9bd380},
+ 	{0x0000a3fc, 0x000f0f01},
+ 	{0x0000a400, 0x8fa91f01},
+ 	{0x0000a404, 0x00000000},
+@@ -780,7 +780,7 @@ static const u32 ar9300_2p2_baseband_cor
+ 	{0x0000a43c, 0x00100000},
+ 	{0x0000a440, 0x00000000},
+ 	{0x0000a444, 0x00000000},
+-	{0x0000a448, 0x06000080},
++	{0x0000a448, 0x05000080},
+ 	{0x0000a44c, 0x00000001},
+ 	{0x0000a450, 0x00010000},
+ 	{0x0000a458, 0x00000000},
+@@ -1500,8 +1500,6 @@ static const u32 ar9300_2p2_mac_core[][2
+ 	{0x0000816c, 0x00000000},
+ 	{0x000081c0, 0x00000000},
+ 	{0x000081c4, 0x33332210},
+-	{0x000081c8, 0x00000000},
+-	{0x000081cc, 0x00000000},
+ 	{0x000081ec, 0x00000000},
+ 	{0x000081f0, 0x00000000},
+ 	{0x000081f4, 0x00000000},
-- 
2.30.2