ath5k: Clean up turbo mode initvals/rfregs

 * Clean up what's left of turbo mode, since we handle all
 register modifications (rfbuffer comes next) on code there
 is no need to have duplicated arrays.

 * Rename change_channel to skip_pcu on initvals.c as we did
 on reset.c

 Signed-off-by: Nick Kossifidis <micklfemm@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath5k/ath5k.h b/drivers/net/wireless/ath/ath5k/ath5k.h
index 81ad236932c87c0a2cc2f758a64d8ebd815c5c5b..899bf4b99b76ef2501709b2ffd042bcf19fa776b 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/ath5k.h
+++ b/drivers/net/wireless/ath/ath5k/ath5k.h
@@ -158,15 +158,6 @@
 #define AR5K_INI_RFGAIN_5GHZ           0
 #define AR5K_INI_RFGAIN_2GHZ           1
 
-/* TODO: Clean this up */
-#define AR5K_INI_VAL_11A               0
-#define AR5K_INI_VAL_11A_TURBO         1
-#define AR5K_INI_VAL_11B               2
-#define AR5K_INI_VAL_11G               3
-#define AR5K_INI_VAL_11G_TURBO         4
-#define AR5K_INI_VAL_XR                        0
-#define AR5K_INI_VAL_MAX               5
-
 /*
  * Some tuneable values (these should be changeable by the user)
  * TODO: Make use of them and add more options OR use debug/configfs
@@ -429,12 +420,10 @@ struct ath5k_srev_name {
 
 enum ath5k_driver_mode {
        AR5K_MODE_11A           =       0,
-       AR5K_MODE_11A_TURBO     =       1,
-       AR5K_MODE_11B           =       2,
-       AR5K_MODE_11G           =       3,
-       AR5K_MODE_11G_TURBO     =       4,
+       AR5K_MODE_11B           =       1,
+       AR5K_MODE_11G           =       2,
        AR5K_MODE_XR            =       0,
-       AR5K_MODE_MAX           =       5
+       AR5K_MODE_MAX           =       3
 };
 
 enum ath5k_ant_mode {

diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 80831171f1b01173933496aa7e2971d0c57f8165..a8d380aae658d7ee617cff974003cbecc5828960 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -328,14 +328,12 @@ ath5k_copy_channels(struct ath5k_hw *ah,
 
        switch (mode) {
        case AR5K_MODE_11A:
-       case AR5K_MODE_11A_TURBO:
                /* 1..220, but 2GHz frequencies are filtered by check_channel */
                size = 220 ;
                chfreq = CHANNEL_5GHZ;
                break;
        case AR5K_MODE_11B:
        case AR5K_MODE_11G:
-       case AR5K_MODE_11G_TURBO:
                size = 26;
                chfreq = CHANNEL_2GHZ;
                break;

diff --git a/drivers/net/wireless/ath/ath5k/caps.c b/drivers/net/wireless/ath/ath5k/caps.c
index beae519aa735a63e91e7dc8ff2cab52b2493f695..31cad80e9b01f84c17e536371ce25f6887ca74e4 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/caps.c
+++ b/drivers/net/wireless/ath/ath5k/caps.c
@@ -49,7 +49,6 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
 
                /* Set supported modes */
                __set_bit(AR5K_MODE_11A, ah->ah_capabilities.cap_mode);
-               __set_bit(AR5K_MODE_11A_TURBO, ah->ah_capabilities.cap_mode);
        } else {
                /*
                 * XXX The tranceiver supports frequencies from 4920 to 6100GHz
@@ -74,11 +73,6 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
                        /* Set supported modes */
                        __set_bit(AR5K_MODE_11A,
                                        ah->ah_capabilities.cap_mode);
-                       __set_bit(AR5K_MODE_11A_TURBO,
-                                       ah->ah_capabilities.cap_mode);
-                       if (ah->ah_version == AR5K_AR5212)
-                               __set_bit(AR5K_MODE_11G_TURBO,
-                                               ah->ah_capabilities.cap_mode);
                }
 
                /* Enable  802.11b if a 2GHz capable radio (2111/5112) is

diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c
index 8fa4393088285c4e2f59ad78b65893a89a995aef..905e4fdffc6d3892f4bdbe379c3bbc5bf464c86f 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/initvals.c
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
@@ -44,7 +44,7 @@ struct ath5k_ini {
 
 struct ath5k_ini_mode {
        u16     mode_register;
-       u32     mode_value[5];
+       u32     mode_value[3];
 };
 
 /* Initial register settings for AR5210 */
@@ -391,76 +391,74 @@ static const struct ath5k_ini ar5211_ini[] = {
  */
 static const struct ath5k_ini_mode ar5211_ini_mode[] = {
        { AR5K_TXCFG,
-       /*        a         aTurbo        b       g (OFDM)    */
-          { 0x00000015, 0x00000015, 0x0000001d, 0x00000015 } },
+       /*      A/XR          B           G       */
+          { 0x00000015, 0x0000001d, 0x00000015 } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(0),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(1),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(2),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(3),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(4),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(5),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(6),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(7),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(8),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(9),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_DCU_GBL_IFS_SLOT,
-          { 0x00000168, 0x000001e0, 0x000001b8, 0x00000168 } },
+          { 0x00000168, 0x000001b8, 0x00000168 } },
        { AR5K_DCU_GBL_IFS_SIFS,
-          { 0x00000230, 0x000001e0, 0x000000b0, 0x00000230 } },
+          { 0x00000230, 0x000000b0, 0x00000230 } },
        { AR5K_DCU_GBL_IFS_EIFS,
-          { 0x00000d98, 0x00001180, 0x00001f48, 0x00000d98 } },
+          { 0x00000d98, 0x00001f48, 0x00000d98 } },
        { AR5K_DCU_GBL_IFS_MISC,
-          { 0x0000a0e0, 0x00014068, 0x00005880, 0x0000a0e0 } },
+          { 0x0000a0e0, 0x00005880, 0x0000a0e0 } },
        { AR5K_TIME_OUT,
-          { 0x04000400, 0x08000800, 0x20003000, 0x04000400 } },
+          { 0x04000400, 0x20003000, 0x04000400 } },
        { AR5K_USEC_5211,
-          { 0x0e8d8fa7, 0x0e8d8fcf, 0x01608f95, 0x0e8d8fa7 } },
-       { AR5K_PHY_TURBO,
-          { 0x00000000, 0x00000003, 0x00000000, 0x00000000 } },
+          { 0x0e8d8fa7, 0x01608f95, 0x0e8d8fa7 } },
        { AR5K_PHY(8),
-          { 0x02020200, 0x02020200, 0x02010200, 0x02020200 } },
-       { AR5K_PHY(9),
-          { 0x00000e0e, 0x00000e0e, 0x00000707, 0x00000e0e } },
-       { AR5K_PHY(10),
-          { 0x0a020001, 0x0a020001, 0x05010000, 0x0a020001 } },
-       { AR5K_PHY(13),
-          { 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e } },
-       { AR5K_PHY(14),
-          { 0x00000007, 0x00000007, 0x0000000b, 0x0000000b } },
-       { AR5K_PHY(17),
-          { 0x1372169c, 0x137216a5, 0x137216a8, 0x1372169c } },
-       { AR5K_PHY(18),
-          { 0x0018ba67, 0x0018ba67, 0x0018ba69, 0x0018ba69 } },
-       { AR5K_PHY(20),
-          { 0x0c28b4e0, 0x0c28b4e0, 0x0c28b4e0, 0x0c28b4e0 } },
+          { 0x02020200, 0x02010200, 0x02020200 } },
+       { AR5K_PHY_RF_CTL2,
+          { 0x00000e0e, 0x00000707, 0x00000e0e } },
+       { AR5K_PHY_RF_CTL3,
+          { 0x0a020001, 0x05010000, 0x0a020001 } },
+       { AR5K_PHY_RF_CTL4,
+          { 0x00000e0e, 0x00000e0e, 0x00000e0e } },
+       { AR5K_PHY_PA_CTL,
+          { 0x00000007, 0x0000000b, 0x0000000b } },
+       { AR5K_PHY_SETTLING,
+          { 0x1372169c, 0x137216a8, 0x1372169c } },
+       { AR5K_PHY_GAIN,
+          { 0x0018ba67, 0x0018ba69, 0x0018ba69 } },
+       { AR5K_PHY_DESIRED_SIZE,
+          { 0x0c28b4e0, 0x0c28b4e0, 0x0c28b4e0 } },
        { AR5K_PHY_SIG,
-          { 0x7e800d2e, 0x7e800d2e, 0x7ec00d2e, 0x7e800d2e } },
+          { 0x7e800d2e, 0x7ec00d2e, 0x7e800d2e } },
        { AR5K_PHY_AGCCOARSE,
-          { 0x31375d5e, 0x31375d5e, 0x313a5d5e, 0x31375d5e } },
+          { 0x31375d5e, 0x313a5d5e, 0x31375d5e } },
        { AR5K_PHY_AGCCTL,
-          { 0x0000bd10, 0x0000bd10, 0x0000bd38, 0x0000bd10 } },
+          { 0x0000bd10, 0x0000bd38, 0x0000bd10 } },
        { AR5K_PHY_NF,
-          { 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 } },
+          { 0x0001ce00, 0x0001ce00, 0x0001ce00 } },
        { AR5K_PHY_RX_DELAY,
-          { 0x00002710, 0x00002710, 0x0000157c, 0x00002710 } },
+          { 0x00002710, 0x0000157c, 0x00002710 } },
        { AR5K_PHY(70),
-          { 0x00000190, 0x00000190, 0x00000084, 0x00000190 } },
+          { 0x00000190, 0x00000084, 0x00000190 } },
        { AR5K_PHY_FRAME_CTL_5211,
-          { 0x6fe01020, 0x6fe01020, 0x6fe00920, 0x6fe01020 } },
+          { 0x6fe01020, 0x6fe00920, 0x6fe01020 } },
        { AR5K_PHY_PCDAC_TXPOWER_BASE,
-          { 0x05ff14ff, 0x05ff14ff, 0x05ff14ff, 0x05ff19ff } },
+          { 0x05ff14ff, 0x05ff14ff, 0x05ff19ff } },
        { AR5K_RF_BUFFER_CONTROL_4,
-          { 0x00000010, 0x00000014, 0x00000010, 0x00000010 } },
+          { 0x00000010, 0x00000010, 0x00000010 } },
 };
 
 /* Initial register settings for AR5212 */
@@ -677,89 +675,87 @@ static const struct ath5k_ini ar5212_ini_common_start[] = {
 /* Initial mode-specific settings for AR5212 (Written before ar5212_ini) */
 static const struct ath5k_ini_mode ar5212_ini_mode_start[] = {
        { AR5K_QUEUE_DFS_LOCAL_IFS(0),
-       /*      a/XR       aTurbo         b        g (DYN)     gTurbo     */
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+       /*      A/XR          B           G       */
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(1),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(2),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(3),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(4),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(5),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(6),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(7),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(8),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_QUEUE_DFS_LOCAL_IFS(9),
-          { 0x002ffc0f, 0x002ffc0f, 0x002ffc1f, 0x002ffc0f, 0x002ffc0f } },
+          { 0x002ffc0f, 0x002ffc1f, 0x002ffc0f } },
        { AR5K_DCU_GBL_IFS_SIFS,
-          { 0x00000230, 0x000001e0, 0x000000b0, 0x00000160, 0x000001e0 } },
+          { 0x00000230, 0x000000b0, 0x00000160 } },
        { AR5K_DCU_GBL_IFS_SLOT,
-          { 0x00000168, 0x000001e0, 0x000001b8, 0x0000018c, 0x000001e0 } },
+          { 0x00000168, 0x000001b8, 0x0000018c } },
        { AR5K_DCU_GBL_IFS_EIFS,
-          { 0x00000e60, 0x00001180, 0x00001f1c, 0x00003e38, 0x00001180 } },
+          { 0x00000e60, 0x00001f1c, 0x00003e38 } },
        { AR5K_DCU_GBL_IFS_MISC,
-          { 0x0000a0e0, 0x00014068, 0x00005880, 0x0000b0e0, 0x00014068 } },
+          { 0x0000a0e0, 0x00005880, 0x0000b0e0 } },
        { AR5K_TIME_OUT,
-          { 0x03e803e8, 0x06e006e0, 0x04200420, 0x08400840, 0x06e006e0 } },
-       { AR5K_PHY_TURBO,
-          { 0x00000000, 0x00000003, 0x00000000, 0x00000000, 0x00000003 } },
+          { 0x03e803e8, 0x04200420, 0x08400840 } },
        { AR5K_PHY(8),
-          { 0x02020200, 0x02020200, 0x02010200, 0x02020200, 0x02020200 } },
+          { 0x02020200, 0x02010200, 0x02020200 } },
        { AR5K_PHY_RF_CTL2,
-          { 0x00000e0e, 0x00000e0e, 0x00000707, 0x00000e0e, 0x00000e0e } },
+          { 0x00000e0e, 0x00000707, 0x00000e0e } },
        { AR5K_PHY_SETTLING,
-          { 0x1372161c, 0x13721c25, 0x13721722, 0x137216a2, 0x13721c25 } },
+          { 0x1372161c, 0x13721722, 0x137216a2 } },
        { AR5K_PHY_AGCCTL,
-          { 0x00009d10, 0x00009d10, 0x00009d18, 0x00009d18, 0x00009d10 } },
+          { 0x00009d10, 0x00009d18, 0x00009d18 } },
        { AR5K_PHY_NF,
-          { 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00, 0x0001ce00 } },
+          { 0x0001ce00, 0x0001ce00, 0x0001ce00 } },
        { AR5K_PHY_WEAK_OFDM_HIGH_THR,
-          { 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190, 0x409a4190 } },
+          { 0x409a4190, 0x409a4190, 0x409a4190 } },
        { AR5K_PHY(70),
-          { 0x000001b8, 0x000001b8, 0x00000084, 0x00000108, 0x000001b8 } },
+          { 0x000001b8, 0x00000084, 0x00000108 } },
        { AR5K_PHY_OFDM_SELFCORR,
-          { 0x10058a05, 0x10058a05, 0x10058a05, 0x10058a05, 0x10058a05 } },
+          { 0x10058a05, 0x10058a05, 0x10058a05 } },
        { 0xa230,
-          { 0x00000000, 0x00000000, 0x00000000, 0x00000108, 0x00000000 } },
+          { 0x00000000, 0x00000000, 0x00000108 } },
 };
 
 /* Initial mode-specific settings for AR5212 + RF5111 (Written after ar5212_ini) */
 static const struct ath5k_ini_mode rf5111_ini_mode_end[] = {
        { AR5K_TXCFG,
-       /*      a/XR       aTurbo         b        g (DYN)     gTurbo     */
-          { 0x00008015, 0x00008015, 0x00008015, 0x00008015, 0x00008015 } },
+       /*      A/XR          B           G       */
+          { 0x00008015, 0x00008015, 0x00008015 } },
        { AR5K_USEC_5211,
-          { 0x128d8fa7, 0x09880fcf, 0x04e00f95, 0x12e00fab, 0x09880fcf } },
+          { 0x128d8fa7, 0x04e00f95, 0x12e00fab } },
        { AR5K_PHY_RF_CTL3,
-          { 0x0a020001, 0x0a020001, 0x05010100, 0x0a020001, 0x0a020001 } },
+          { 0x0a020001, 0x05010100, 0x0a020001 } },
        { AR5K_PHY_RF_CTL4,
-          { 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e } },
+          { 0x00000e0e, 0x00000e0e, 0x00000e0e } },
        { AR5K_PHY_PA_CTL,
-          { 0x00000007, 0x00000007, 0x0000000b, 0x0000000b, 0x0000000b } },
+          { 0x00000007, 0x0000000b, 0x0000000b } },
        { AR5K_PHY_GAIN,
-          { 0x0018da5a, 0x0018da5a, 0x0018ca69, 0x0018ca69, 0x0018ca69 } },
+          { 0x0018da5a, 0x0018ca69, 0x0018ca69 } },
        { AR5K_PHY_DESIRED_SIZE,
-          { 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0 } },
+          { 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0 } },
        { AR5K_PHY_SIG,
-          { 0x7e800d2e, 0x7e800d2e, 0x7ee84d2e, 0x7ee84d2e, 0x7e800d2e } },
+          { 0x7e800d2e, 0x7ee84d2e, 0x7ee84d2e } },
        { AR5K_PHY_AGCCOARSE,
-          { 0x3137665e, 0x3137665e, 0x3137665e, 0x3137665e, 0x3137615e } },
+          { 0x3137665e, 0x3137665e, 0x3137665e } },
        { AR5K_PHY_WEAK_OFDM_LOW_THR,
-          { 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb080, 0x050cb080 } },
+          { 0x050cb081, 0x050cb081, 0x050cb080 } },
        { AR5K_PHY_RX_DELAY,
-          { 0x00002710, 0x00002710, 0x0000157c, 0x00002af8, 0x00002710 } },
+          { 0x00002710, 0x0000157c, 0x00002af8 } },
        { AR5K_PHY_FRAME_CTL_5211,
-          { 0xf7b81020, 0xf7b81020, 0xf7b80d20, 0xf7b81020, 0xf7b81020 } },
+          { 0xf7b81020, 0xf7b80d20, 0xf7b81020 } },
        { AR5K_PHY_GAIN_2GHZ,
-          { 0x642c416a, 0x642c416a, 0x6440416a, 0x6440416a, 0x6440416a } },
+          { 0x642c416a, 0x6440416a, 0x6440416a } },
        { AR5K_PHY_CCK_RX_CTL_4,
-          { 0x1883800a, 0x1883800a, 0x1873800a, 0x1883800a, 0x1883800a } },
+          { 0x1883800a, 0x1873800a, 0x1883800a } },
 };
 
 static const struct ath5k_ini rf5111_ini_common_end[] = {
@@ -782,38 +778,38 @@ static const struct ath5k_ini rf5111_ini_common_end[] = {
 /* Initial mode-specific settings for AR5212 + RF5112 (Written after ar5212_ini) */
 static const struct ath5k_ini_mode rf5112_ini_mode_end[] = {
        { AR5K_TXCFG,
-       /*      a/XR       aTurbo         b        g (DYN)     gTurbo     */
-          { 0x00008015, 0x00008015, 0x00008015, 0x00008015, 0x00008015 } },
+       /*      A/XR          B           G       */
+          { 0x00008015, 0x00008015, 0x00008015 } },
        { AR5K_USEC_5211,
-          { 0x128d93a7, 0x098813cf, 0x04e01395, 0x12e013ab, 0x098813cf } },
+          { 0x128d93a7, 0x04e01395, 0x12e013ab } },
        { AR5K_PHY_RF_CTL3,
-          { 0x0a020001, 0x0a020001, 0x05020100, 0x0a020001, 0x0a020001 } },
+          { 0x0a020001, 0x05020100, 0x0a020001 } },
        { AR5K_PHY_RF_CTL4,
-          { 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e } },
+          { 0x00000e0e, 0x00000e0e, 0x00000e0e } },
        { AR5K_PHY_PA_CTL,
-          { 0x00000007, 0x00000007, 0x0000000b, 0x0000000b, 0x0000000b } },
+          { 0x00000007, 0x0000000b, 0x0000000b } },
        { AR5K_PHY_GAIN,
-          { 0x0018da6d, 0x0018da6d, 0x0018ca75, 0x0018ca75, 0x0018ca75 } },
+          { 0x0018da6d, 0x0018ca75, 0x0018ca75 } },
        { AR5K_PHY_DESIRED_SIZE,
-          { 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0 } },
+          { 0x0de8b4e0, 0x0de8b4e0, 0x0de8b4e0 } },
        { AR5K_PHY_SIG,
-          { 0x7e800d2e, 0x7e800d2e, 0x7ee80d2e, 0x7ee80d2e, 0x7e800d2e } },
+          { 0x7e800d2e, 0x7ee80d2e, 0x7ee80d2e } },
        { AR5K_PHY_AGCCOARSE,
-          { 0x3137665e, 0x3137665e, 0x3137665e, 0x3137665e, 0x3137665e } },
+          { 0x3137665e, 0x3137665e, 0x3137665e } },
        { AR5K_PHY_WEAK_OFDM_LOW_THR,
-          { 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 } },
+          { 0x050cb081, 0x050cb081, 0x050cb081 } },
        { AR5K_PHY_RX_DELAY,
-          { 0x000007d0, 0x000007d0, 0x0000044c, 0x00000898, 0x000007d0 } },
+          { 0x000007d0, 0x0000044c, 0x00000898 } },
        { AR5K_PHY_FRAME_CTL_5211,
-          { 0xf7b81020, 0xf7b81020, 0xf7b80d10, 0xf7b81010, 0xf7b81010 } },
+          { 0xf7b81020, 0xf7b80d10, 0xf7b81010 } },
        { AR5K_PHY_CCKTXCTL,
-          { 0x00000000, 0x00000000, 0x00000008, 0x00000008, 0x00000008 } },
+          { 0x00000000, 0x00000008, 0x00000008 } },
        { AR5K_PHY_CCK_CROSSCORR,
-          { 0xd6be6788, 0xd6be6788, 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+          { 0xd6be6788, 0xd03e6788, 0xd03e6788 } },
        { AR5K_PHY_GAIN_2GHZ,
-          { 0x642c0140, 0x642c0140, 0x6442c160, 0x6442c160, 0x6442c160 } },
+          { 0x642c0140, 0x6442c160, 0x6442c160 } },
        { AR5K_PHY_CCK_RX_CTL_4,
-          { 0x1883800a, 0x1883800a, 0x1873800a, 0x1883800a, 0x1883800a } },
+          { 0x1883800a, 0x1873800a, 0x1883800a } },
 };
 
 static const struct ath5k_ini rf5112_ini_common_end[] = {
@@ -833,66 +829,66 @@ static const struct ath5k_ini rf5112_ini_common_end[] = {
 /* Initial mode-specific settings for RF5413/5414 (Written after ar5212_ini) */
 static const struct ath5k_ini_mode rf5413_ini_mode_end[] = {
        { AR5K_TXCFG,
-       /*      a/XR       aTurbo         b        g (DYN)     gTurbo     */
-          { 0x00000015, 0x00000015, 0x00000015, 0x00000015, 0x00000015 } },
+       /*      A/XR          B           G       */
+          { 0x00000015, 0x00000015, 0x00000015 } },
        { AR5K_USEC_5211,
-          { 0x128d93a7, 0x098813cf, 0x04e01395, 0x12e013ab, 0x098813cf } },
+          { 0x128d93a7, 0x04e01395, 0x12e013ab } },
        { AR5K_PHY_RF_CTL3,
-          { 0x0a020001, 0x0a020001, 0x05020100, 0x0a020001, 0x0a020001 } },
+          { 0x0a020001, 0x05020100, 0x0a020001 } },
        { AR5K_PHY_RF_CTL4,
-          { 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e } },
+          { 0x00000e0e, 0x00000e0e, 0x00000e0e } },
        { AR5K_PHY_PA_CTL,
-          { 0x00000007, 0x00000007, 0x0000000b, 0x0000000b, 0x0000000b } },
+          { 0x00000007, 0x0000000b, 0x0000000b } },
        { AR5K_PHY_GAIN,
-          { 0x0018fa61, 0x0018fa61, 0x001a1a63, 0x001a1a63, 0x001a1a63 } },
+          { 0x0018fa61, 0x001a1a63, 0x001a1a63 } },
        { AR5K_PHY_DESIRED_SIZE,
-          { 0x0c98b4e0, 0x0c98b4e0, 0x0c98b0da, 0x0c98b0da, 0x0c98b0da } },
+          { 0x0c98b4e0, 0x0c98b0da, 0x0c98b0da } },
        { AR5K_PHY_SIG,
-          { 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e } },
+          { 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e } },
        { AR5K_PHY_AGCCOARSE,
-          { 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e } },
+          { 0x3139605e, 0x3139605e, 0x3139605e } },
        { AR5K_PHY_WEAK_OFDM_LOW_THR,
-          { 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 } },
+          { 0x050cb081, 0x050cb081, 0x050cb081 } },
        { AR5K_PHY_RX_DELAY,
-          { 0x000007d0, 0x000007d0, 0x0000044c, 0x00000898, 0x000007d0 } },
+          { 0x000007d0, 0x0000044c, 0x00000898 } },
        { AR5K_PHY_FRAME_CTL_5211,
-          { 0xf7b81000, 0xf7b81000, 0xf7b80d00, 0xf7b81000, 0xf7b81000 } },
+          { 0xf7b81000, 0xf7b80d00, 0xf7b81000 } },
        { AR5K_PHY_CCKTXCTL,
-          { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
+          { 0x00000000, 0x00000000, 0x00000000 } },
        { AR5K_PHY_CCK_CROSSCORR,
-          { 0xd6be6788, 0xd6be6788, 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+          { 0xd6be6788, 0xd03e6788, 0xd03e6788 } },
        { AR5K_PHY_GAIN_2GHZ,
-          { 0x002ec1e0, 0x002ec1e0, 0x002ac120, 0x002ac120, 0x002ac120 } },
+          { 0x002ec1e0, 0x002ac120, 0x002ac120 } },
        { AR5K_PHY_CCK_RX_CTL_4,
-          { 0x1883800a, 0x1883800a, 0x1863800a, 0x1883800a, 0x1883800a } },
+          { 0x1883800a, 0x1863800a, 0x1883800a } },
        { 0xa300,
-          { 0x18010000, 0x18010000, 0x18010000, 0x18010000, 0x18010000 } },
+          { 0x18010000, 0x18010000, 0x18010000 } },
        { 0xa304,
-          { 0x30032602, 0x30032602, 0x30032602, 0x30032602, 0x30032602 } },
+          { 0x30032602, 0x30032602, 0x30032602 } },
        { 0xa308,
-          { 0x48073e06, 0x48073e06, 0x48073e06, 0x48073e06, 0x48073e06 } },
+          { 0x48073e06, 0x48073e06, 0x48073e06 } },
        { 0xa30c,
-          { 0x560b4c0a, 0x560b4c0a, 0x560b4c0a, 0x560b4c0a, 0x560b4c0a } },
+          { 0x560b4c0a, 0x560b4c0a, 0x560b4c0a } },
        { 0xa310,
-          { 0x641a600f, 0x641a600f, 0x641a600f, 0x641a600f, 0x641a600f } },
+          { 0x641a600f, 0x641a600f, 0x641a600f } },
        { 0xa314,
-          { 0x784f6e1b, 0x784f6e1b, 0x784f6e1b, 0x784f6e1b, 0x784f6e1b } },
+          { 0x784f6e1b, 0x784f6e1b, 0x784f6e1b } },
        { 0xa318,
-          { 0x868f7c5a, 0x868f7c5a, 0x868f7c5a, 0x868f7c5a, 0x868f7c5a } },
+          { 0x868f7c5a, 0x868f7c5a, 0x868f7c5a } },
        { 0xa31c,
-          { 0x90cf865b, 0x90cf865b, 0x8ecf865b, 0x8ecf865b, 0x8ecf865b } },
+          { 0x90cf865b, 0x8ecf865b, 0x8ecf865b } },
        { 0xa320,
-          { 0x9d4f970f, 0x9d4f970f, 0x9b4f970f, 0x9b4f970f, 0x9b4f970f } },
+          { 0x9d4f970f, 0x9b4f970f, 0x9b4f970f } },
        { 0xa324,
-          { 0xa7cfa38f, 0xa7cfa38f, 0xa3cf9f8f, 0xa3cf9f8f, 0xa3cf9f8f } },
+          { 0xa7cfa38f, 0xa3cf9f8f, 0xa3cf9f8f } },
        { 0xa328,
-          { 0xb55faf1f, 0xb55faf1f, 0xb35faf1f, 0xb35faf1f, 0xb35faf1f } },
+          { 0xb55faf1f, 0xb35faf1f, 0xb35faf1f } },
        { 0xa32c,
-          { 0xbddfb99f, 0xbddfb99f, 0xbbdfb99f, 0xbbdfb99f, 0xbbdfb99f } },
+          { 0xbddfb99f, 0xbbdfb99f, 0xbbdfb99f } },
        { 0xa330,
-          { 0xcb7fc53f, 0xcb7fc53f, 0xcb7fc73f, 0xcb7fc73f, 0xcb7fc73f } },
+          { 0xcb7fc53f, 0xcb7fc73f, 0xcb7fc73f } },
        { 0xa334,
-          { 0xd5ffd1bf, 0xd5ffd1bf, 0xd3ffd1bf, 0xd3ffd1bf, 0xd3ffd1bf } },
+          { 0xd5ffd1bf, 0xd3ffd1bf, 0xd3ffd1bf } },
 };
 
 static const struct ath5k_ini rf5413_ini_common_end[] = {
@@ -972,38 +968,38 @@ static const struct ath5k_ini rf5413_ini_common_end[] = {
 /* XXX: a mode ? */
 static const struct ath5k_ini_mode rf2413_ini_mode_end[] = {
        { AR5K_TXCFG,
-       /*      a/XR       aTurbo         b        g (DYN)     gTurbo     */
-          { 0x00000015, 0x00000015, 0x00000015, 0x00000015, 0x00000015 } },
+       /*      A/XR          B           G       */
+          { 0x00000015, 0x00000015, 0x00000015 } },
        { AR5K_USEC_5211,
-          { 0x128d93a7, 0x098813cf, 0x04e01395, 0x12e013ab, 0x098813cf } },
+          { 0x128d93a7, 0x04e01395, 0x12e013ab } },
        { AR5K_PHY_RF_CTL3,
-          { 0x0a020001, 0x0a020001, 0x05020000, 0x0a020001, 0x0a020001 } },
+          { 0x0a020001, 0x05020000, 0x0a020001 } },
        { AR5K_PHY_RF_CTL4,
-          { 0x00000e00, 0x00000e00, 0x00000e00, 0x00000e00, 0x00000e00 } },
+          { 0x00000e00, 0x00000e00, 0x00000e00 } },
        { AR5K_PHY_PA_CTL,
-          { 0x00000002, 0x00000002, 0x0000000a, 0x0000000a, 0x0000000a } },
+          { 0x00000002, 0x0000000a, 0x0000000a } },
        { AR5K_PHY_GAIN,
-          { 0x0018da6d, 0x0018da6d, 0x001a6a64, 0x001a6a64, 0x001a6a64 } },
+          { 0x0018da6d, 0x001a6a64, 0x001a6a64 } },
        { AR5K_PHY_DESIRED_SIZE,
-          { 0x0de8b4e0, 0x0de8b4e0, 0x0de8b0da, 0x0c98b0da, 0x0de8b0da } },
+          { 0x0de8b4e0, 0x0de8b0da, 0x0c98b0da } },
        { AR5K_PHY_SIG,
-          { 0x7e800d2e, 0x7e800d2e, 0x7ee80d2e, 0x7ec80d2e, 0x7e800d2e } },
+          { 0x7e800d2e, 0x7ee80d2e, 0x7ec80d2e } },
        { AR5K_PHY_AGCCOARSE,
-          { 0x3137665e, 0x3137665e, 0x3137665e, 0x3139605e, 0x3137665e } },
+          { 0x3137665e, 0x3137665e, 0x3139605e } },
        { AR5K_PHY_WEAK_OFDM_LOW_THR,
-          { 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 } },
+          { 0x050cb081, 0x050cb081, 0x050cb081 } },
        { AR5K_PHY_RX_DELAY,
-          { 0x000007d0, 0x000007d0, 0x0000044c, 0x00000898, 0x000007d0 } },
+          { 0x000007d0, 0x0000044c, 0x00000898 } },
        { AR5K_PHY_FRAME_CTL_5211,
-          { 0xf7b81000, 0xf7b81000, 0xf7b80d00, 0xf7b81000, 0xf7b81000 } },
+          { 0xf7b81000, 0xf7b80d00, 0xf7b81000 } },
        { AR5K_PHY_CCKTXCTL,
-          { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
+          { 0x00000000, 0x00000000, 0x00000000 } },
        { AR5K_PHY_CCK_CROSSCORR,
-          { 0xd6be6788, 0xd6be6788, 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+          { 0xd6be6788, 0xd03e6788, 0xd03e6788 } },
        { AR5K_PHY_GAIN_2GHZ,
-          { 0x002c0140, 0x002c0140, 0x0042c140, 0x0042c140, 0x0042c140 } },
+          { 0x002c0140, 0x0042c140, 0x0042c140 } },
        { AR5K_PHY_CCK_RX_CTL_4,
-          { 0x1883800a, 0x1883800a, 0x1863800a, 0x1883800a, 0x1883800a } },
+          { 0x1883800a, 0x1863800a, 0x1883800a } },
 };
 
 static const struct ath5k_ini rf2413_ini_common_end[] = {
@@ -1094,52 +1090,50 @@ static const struct ath5k_ini rf2413_ini_common_end[] = {
 /* XXX: a mode ? */
 static const struct ath5k_ini_mode rf2425_ini_mode_end[] = {
        { AR5K_TXCFG,
-       /*      a/XR       aTurbo         b        g (DYN)     gTurbo     */
-          { 0x00000015, 0x00000015, 0x00000015, 0x00000015, 0x00000015 } },
+       /*      A/XR          B           G       */
+          { 0x00000015, 0x00000015, 0x00000015 } },
        { AR5K_USEC_5211,
-          { 0x128d93a7, 0x098813cf, 0x04e01395, 0x12e013ab, 0x098813cf } },
-       { AR5K_PHY_TURBO,
-          { 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000001 } },
+          { 0x128d93a7, 0x04e01395, 0x12e013ab } },
        { AR5K_PHY_RF_CTL3,
-          { 0x0a020001, 0x0a020001, 0x05020100, 0x0a020001, 0x0a020001 } },
+          { 0x0a020001, 0x05020100, 0x0a020001 } },
        { AR5K_PHY_RF_CTL4,
-          { 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e } },
+          { 0x00000e0e, 0x00000e0e, 0x00000e0e } },
        { AR5K_PHY_PA_CTL,
-          { 0x00000003, 0x00000003, 0x0000000b, 0x0000000b, 0x0000000b } },
+          { 0x00000003, 0x0000000b, 0x0000000b } },
        { AR5K_PHY_SETTLING,
-          { 0x1372161c, 0x13721c25, 0x13721722, 0x13721422, 0x13721c25 } },
+          { 0x1372161c, 0x13721722, 0x13721422 } },
        { AR5K_PHY_GAIN,
-          { 0x0018fa61, 0x0018fa61, 0x00199a65, 0x00199a65, 0x00199a65 } },
+          { 0x0018fa61, 0x00199a65, 0x00199a65 } },
        { AR5K_PHY_DESIRED_SIZE,
-          { 0x0c98b4e0, 0x0c98b4e0, 0x0c98b0da, 0x0c98b0da, 0x0c98b0da } },
+          { 0x0c98b4e0, 0x0c98b0da, 0x0c98b0da } },
        { AR5K_PHY_SIG,
-          { 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e } },
+          { 0x7ec80d2e, 0x7ec80d2e, 0x7ec80d2e } },
        { AR5K_PHY_AGCCOARSE,
-          { 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e, 0x3139605e } },
+          { 0x3139605e, 0x3139605e, 0x3139605e } },
        { AR5K_PHY_WEAK_OFDM_LOW_THR,
-          { 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081, 0x050cb081 } },
+          { 0x050cb081, 0x050cb081, 0x050cb081 } },
        { AR5K_PHY_RX_DELAY,
-          { 0x000007d0, 0x000007d0, 0x0000044c, 0x00000898, 0x000007d0 } },
+          { 0x000007d0, 0x0000044c, 0x00000898 } },
        { AR5K_PHY_FRAME_CTL_5211,
-          { 0xf7b81000, 0xf7b81000, 0xf7b80d00, 0xf7b81000, 0xf7b81000 } },
+          { 0xf7b81000, 0xf7b80d00, 0xf7b81000 } },
        { AR5K_PHY_CCKTXCTL,
-          { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
+          { 0x00000000, 0x00000000, 0x00000000 } },
        { AR5K_PHY_CCK_CROSSCORR,
-          { 0xd6be6788, 0xd6be6788, 0xd03e6788, 0xd03e6788, 0xd03e6788 } },
+          { 0xd6be6788, 0xd03e6788, 0xd03e6788 } },
        { AR5K_PHY_GAIN_2GHZ,
-          { 0x00000140, 0x00000140, 0x0052c140, 0x0052c140, 0x0052c140 } },
+          { 0x00000140, 0x0052c140, 0x0052c140 } },
        { AR5K_PHY_CCK_RX_CTL_4,
-          { 0x1883800a, 0x1883800a, 0x1863800a, 0x1883800a, 0x1883800a } },
+          { 0x1883800a, 0x1863800a, 0x1883800a } },
        { 0xa324,
-          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
+          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
        { 0xa328,
-          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
+          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
        { 0xa32c,
-          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
+          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
        { 0xa330,
-          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
+          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
        { 0xa334,
-          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
+          { 0xa7cfa7cf, 0xa7cfa7cf, 0xa7cfa7cf } },
 };
 
 static const struct ath5k_ini rf2425_ini_common_end[] = {
@@ -1368,15 +1362,15 @@ static const struct ath5k_ini rf5112_ini_bbgain[] = {
  * Write initial register dump
  */
 static void ath5k_hw_ini_registers(struct ath5k_hw *ah, unsigned int size,
-               const struct ath5k_ini *ini_regs, bool change_channel)
+               const struct ath5k_ini *ini_regs, bool skip_pcu)
 {
        unsigned int i;
 
        /* Write initial registers */
        for (i = 0; i < size; i++) {
-               /* On channel change there is
-                * no need to mess with PCU */
-               if (change_channel &&
+               /* Skip PCU registers if
+                * requested */
+               if (skip_pcu &&
                                ini_regs[i].ini_register >= AR5K_PCU_MIN &&
                                ini_regs[i].ini_register <= AR5K_PCU_MAX)
                        continue;
@@ -1409,7 +1403,7 @@ static void ath5k_hw_ini_mode_registers(struct ath5k_hw *ah,
 
 }
 
-int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
+int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool skip_pcu)
 {
        /*
         * Write initial register settings
@@ -1427,7 +1421,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
                 * Write initial settings common for all modes
                 */
                ath5k_hw_ini_registers(ah, ARRAY_SIZE(ar5212_ini_common_start),
-                               ar5212_ini_common_start, change_channel);
+                               ar5212_ini_common_start, skip_pcu);
 
                /* Second set of mode-specific settings */
                switch (ah->ah_radio) {
@@ -1439,12 +1433,12 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5111_ini_common_end),
-                                       rf5111_ini_common_end, change_channel);
+                                       rf5111_ini_common_end, skip_pcu);
 
                        /* Baseband gain table */
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5111_ini_bbgain),
-                                       rf5111_ini_bbgain, change_channel);
+                                       rf5111_ini_bbgain, skip_pcu);
 
                        break;
                case AR5K_RF5112:
@@ -1455,11 +1449,11 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5112_ini_common_end),
-                                       rf5112_ini_common_end, change_channel);
+                                       rf5112_ini_common_end, skip_pcu);
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5112_ini_bbgain),
-                                       rf5112_ini_bbgain, change_channel);
+                                       rf5112_ini_bbgain, skip_pcu);
 
                        break;
                case AR5K_RF5413:
@@ -1470,11 +1464,11 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5413_ini_common_end),
-                                       rf5413_ini_common_end, change_channel);
+                                       rf5413_ini_common_end, skip_pcu);
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5112_ini_bbgain),
-                                       rf5112_ini_bbgain, change_channel);
+                                       rf5112_ini_bbgain, skip_pcu);
 
                        break;
                case AR5K_RF2316:
@@ -1486,7 +1480,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf2413_ini_common_end),
-                                       rf2413_ini_common_end, change_channel);
+                                       rf2413_ini_common_end, skip_pcu);
 
                        /* Override settings from rf2413_ini_common_end */
                        if (ah->ah_radio == AR5K_RF2316) {
@@ -1498,7 +1492,7 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5112_ini_bbgain),
-                                       rf5112_ini_bbgain, change_channel);
+                                       rf5112_ini_bbgain, skip_pcu);
                        break;
                case AR5K_RF2317:
                case AR5K_RF2425:
@@ -1509,11 +1503,11 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf2425_ini_common_end),
-                                       rf2425_ini_common_end, change_channel);
+                                       rf2425_ini_common_end, skip_pcu);
 
                        ath5k_hw_ini_registers(ah,
                                        ARRAY_SIZE(rf5112_ini_bbgain),
-                                       rf5112_ini_bbgain, change_channel);
+                                       rf5112_ini_bbgain, skip_pcu);
                        break;
                default:
                        return -EINVAL;
@@ -1538,17 +1532,17 @@ int ath5k_hw_write_initvals(struct ath5k_hw *ah, u8 mode, bool change_channel)
                 * Write initial settings common for all modes
                 */
                ath5k_hw_ini_registers(ah, ARRAY_SIZE(ar5211_ini),
-                               ar5211_ini, change_channel);
+                               ar5211_ini, skip_pcu);
 
                /* AR5211 only comes with 5111 */
 
                /* Baseband gain table */
                ath5k_hw_ini_registers(ah, ARRAY_SIZE(rf5111_ini_bbgain),
-                               rf5111_ini_bbgain, change_channel);
+                               rf5111_ini_bbgain, skip_pcu);
        /* For AR5210 (for mode settings check out ath5k_hw_reset_tx_queue) */
        } else if (ah->ah_version == AR5K_AR5210) {
                ath5k_hw_ini_registers(ah, ARRAY_SIZE(ar5210_ini),
-                               ar5210_ini, change_channel);
+                               ar5210_ini, skip_pcu);
        }
 
        return 0;

diff --git a/drivers/net/wireless/ath/ath5k/rfbuffer.h b/drivers/net/wireless/ath/ath5k/rfbuffer.h
index 3ac4cff4239de9d8457246e8089caf8a9b5906c2..70356bacd5dbfb9155fadbc0ebe9f833a4af2a18 100644 (file)
--- a/drivers/net/wireless/ath/ath5k/rfbuffer.h
+++ b/drivers/net/wireless/ath/ath5k/rfbuffer.h
@@ -51,7 +51,7 @@
 struct ath5k_ini_rfbuffer {
        u8      rfb_bank;               /* RF Bank number */
        u16     rfb_ctrl_register;      /* RF Buffer control register */
-       u32     rfb_mode_data[5];       /* RF Buffer data for each mode */
+       u32     rfb_mode_data[3];       /* RF Buffer data for each mode */
 };
 
 /*
@@ -177,97 +177,52 @@ static const struct ath5k_rf_reg rf_regs_5111[] = {
 
 /* Default mode specific settings */
 static const struct ath5k_ini_rfbuffer rfb_5111[] = {
-       { 0, 0x989c,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00380000, 0x00380000, 0x00380000, 0x00380000, 0x00380000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 0, 0x989c,
-           { 0x00000000, 0x00000000, 0x000000c0, 0x00000080, 0x00000080 } },
-       { 0, 0x989c,
-           { 0x000400f9, 0x000400f9, 0x000400ff, 0x000400fd, 0x000400fd } },
-       { 0, 0x98d4,
-           { 0x00000000, 0x00000000, 0x00000004, 0x00000004, 0x00000004 } },
-       { 1, 0x98d4,
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d4,
-           { 0x00000010, 0x00000014, 0x00000010, 0x00000010, 0x00000014 } },
-       { 3, 0x98d8,
-           { 0x00601068, 0x00601068, 0x00601068, 0x00601068, 0x00601068 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000 } },
-       { 6, 0x989c,
-           { 0x04000000, 0x04000000, 0x04000000, 0x04000000, 0x04000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x0a000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x003800c0, 0x00380080, 0x023800c0, 0x003800c0, 0x003800c0 } },
-       { 6, 0x989c,
-           { 0x00020006, 0x00020006, 0x00000006, 0x00020006, 0x00020006 } },
-       { 6, 0x989c,
-           { 0x00000089, 0x00000089, 0x00000089, 0x00000089, 0x00000089 } },
-       { 6, 0x989c,
-           { 0x000000a0, 0x000000a0, 0x000000a0, 0x000000a0, 0x000000a0 } },
-       { 6, 0x989c,
-           { 0x00040007, 0x00040007, 0x00040007, 0x00040007, 0x00040007 } },
-       { 6, 0x98d4,
-           { 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a } },
-       { 7, 0x989c,
-           { 0x00000040, 0x00000048, 0x00000040, 0x00000040, 0x00000040 } },
-       { 7, 0x989c,
-           { 0x00000010, 0x00000010, 0x00000010, 0x00000010, 0x00000010 } },
-       { 7, 0x989c,
-           { 0x00000008, 0x00000008, 0x00000008, 0x00000008, 0x00000008 } },
-       { 7, 0x989c,
-           { 0x0000004f, 0x0000004f, 0x0000004f, 0x0000004f, 0x0000004f } },
-       { 7, 0x989c,
-           { 0x000000f1, 0x000000f1, 0x00000061, 0x000000f1, 0x000000f1 } },
-       { 7, 0x989c,
-           { 0x0000904f, 0x0000904f, 0x0000904c, 0x0000904f, 0x0000904f } },
-       { 7, 0x989c,
-           { 0x0000125a, 0x0000125a, 0x0000129a, 0x0000125a, 0x0000125a } },
-       { 7, 0x98cc,
-           { 0x0000000e, 0x0000000e, 0x0000000f, 0x0000000e, 0x0000000e } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00380000, 0x00380000, 0x00380000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 0, 0x989c, { 0x00000000, 0x000000c0, 0x00000080 } },
+       { 0, 0x989c, { 0x000400f9, 0x000400ff, 0x000400fd } },
+       { 0, 0x98d4, { 0x00000000, 0x00000004, 0x00000004 } },
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d4, { 0x00000010, 0x00000010, 0x00000010 } },
+       { 3, 0x98d8, { 0x00601068, 0x00601068, 0x00601068 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x10000000, 0x10000000, 0x10000000 } },
+       { 6, 0x989c, { 0x04000000, 0x04000000, 0x04000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x0a000000, 0x00000000 } },
+       { 6, 0x989c, { 0x003800c0, 0x023800c0, 0x003800c0 } },
+       { 6, 0x989c, { 0x00020006, 0x00000006, 0x00020006 } },
+       { 6, 0x989c, { 0x00000089, 0x00000089, 0x00000089 } },
+       { 6, 0x989c, { 0x000000a0, 0x000000a0, 0x000000a0 } },
+       { 6, 0x989c, { 0x00040007, 0x00040007, 0x00040007 } },
+       { 6, 0x98d4, { 0x0000001a, 0x0000001a, 0x0000001a } },
+       { 7, 0x989c, { 0x00000040, 0x00000040, 0x00000040 } },
+       { 7, 0x989c, { 0x00000010, 0x00000010, 0x00000010 } },
+       { 7, 0x989c, { 0x00000008, 0x00000008, 0x00000008 } },
+       { 7, 0x989c, { 0x0000004f, 0x0000004f, 0x0000004f } },
+       { 7, 0x989c, { 0x000000f1, 0x00000061, 0x000000f1 } },
+       { 7, 0x989c, { 0x0000904f, 0x0000904c, 0x0000904f } },
+       { 7, 0x989c, { 0x0000125a, 0x0000129a, 0x0000125a } },
+       { 7, 0x98cc, { 0x0000000e, 0x0000000f, 0x0000000e } },
 };
 
 
@@ -335,115 +290,61 @@ static const struct ath5k_rf_reg rf_regs_5112[] = {
 
 /* Default mode specific settings */
 static const struct ath5k_ini_rfbuffer rfb_5112[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x03060408, 0x03070408, 0x03060408, 0x03060408, 0x03070408 } },
-       { 3, 0x98dc,
-           { 0x00a0c0c0, 0x00a0c0c0, 0x00e0c0c0, 0x00e0c0c0, 0x00e0c0c0 } },
-       { 6, 0x989c,
-           { 0x00a00000, 0x00a00000, 0x00a00000, 0x00a00000, 0x00a00000 } },
-       { 6, 0x989c,
-           { 0x000a0000, 0x000a0000, 0x000a0000, 0x000a0000, 0x000a0000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00660000, 0x00660000, 0x00660000, 0x00660000, 0x00660000 } },
-       { 6, 0x989c,
-           { 0x00db0000, 0x00db0000, 0x00db0000, 0x00db0000, 0x00db0000 } },
-       { 6, 0x989c,
-           { 0x00f10000, 0x00f10000, 0x00f10000, 0x00f10000, 0x00f10000 } },
-       { 6, 0x989c,
-           { 0x00120000, 0x00120000, 0x00120000, 0x00120000, 0x00120000 } },
-       { 6, 0x989c,
-           { 0x00120000, 0x00120000, 0x00120000, 0x00120000, 0x00120000 } },
-       { 6, 0x989c,
-           { 0x00730000, 0x00730000, 0x00730000, 0x00730000, 0x00730000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x000c0000, 0x000c0000, 0x000c0000, 0x000c0000, 0x000c0000 } },
-       { 6, 0x989c,
-           { 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
-       { 6, 0x989c,
-           { 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
-       { 6, 0x989c,
-           { 0x008b0000, 0x008b0000, 0x008b0000, 0x008b0000, 0x008b0000 } },
-       { 6, 0x989c,
-           { 0x00600000, 0x00600000, 0x00600000, 0x00600000, 0x00600000 } },
-       { 6, 0x989c,
-           { 0x000c0000, 0x000c0000, 0x000c0000, 0x000c0000, 0x000c0000 } },
-       { 6, 0x989c,
-           { 0x00840000, 0x00840000, 0x00840000, 0x00840000, 0x00840000 } },
-       { 6, 0x989c,
-           { 0x00640000, 0x00640000, 0x00640000, 0x00640000, 0x00640000 } },
-       { 6, 0x989c,
-           { 0x00200000, 0x00200000, 0x00200000, 0x00200000, 0x00200000 } },
-       { 6, 0x989c,
-           { 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000 } },
-       { 6, 0x989c,
-           { 0x00250000, 0x00250000, 0x00250000, 0x00250000, 0x00250000 } },
-       { 6, 0x989c,
-           { 0x00110000, 0x00110000, 0x00110000, 0x00110000, 0x00110000 } },
-       { 6, 0x989c,
-           { 0x00110000, 0x00110000, 0x00110000, 0x00110000, 0x00110000 } },
-       { 6, 0x989c,
-           { 0x00510000, 0x00510000, 0x00510000, 0x00510000, 0x00510000 } },
-       { 6, 0x989c,
-           { 0x1c040000, 0x1c040000, 0x1c040000, 0x1c040000, 0x1c040000 } },
-       { 6, 0x989c,
-           { 0x000a0000, 0x000a0000, 0x000a0000, 0x000a0000, 0x000a0000 } },
-       { 6, 0x989c,
-           { 0x00a10000, 0x00a10000, 0x00a10000, 0x00a10000, 0x00a10000 } },
-       { 6, 0x989c,
-           { 0x00400000, 0x00400000, 0x00400000, 0x00400000, 0x00400000 } },
-       { 6, 0x989c,
-           { 0x03090000, 0x03090000, 0x03090000, 0x03090000, 0x03090000 } },
-       { 6, 0x989c,
-           { 0x06000000, 0x06000000, 0x06000000, 0x06000000, 0x06000000 } },
-       { 6, 0x989c,
-           { 0x000000b0, 0x000000b0, 0x000000a8, 0x000000a8, 0x000000a8 } },
-       { 6, 0x989c,
-           { 0x0000002e, 0x0000002e, 0x0000002e, 0x0000002e, 0x0000002e } },
-       { 6, 0x989c,
-           { 0x006c4a41, 0x006c4a41, 0x006c4af1, 0x006c4a61, 0x006c4a61 } },
-       { 6, 0x989c,
-           { 0x0050892a, 0x0050892a, 0x0050892b, 0x0050892b, 0x0050892b } },
-       { 6, 0x989c,
-           { 0x00842400, 0x00842400, 0x00842400, 0x00842400, 0x00842400 } },
-       { 6, 0x989c,
-           { 0x00c69200, 0x00c69200, 0x00c69200, 0x00c69200, 0x00c69200 } },
-       { 6, 0x98d0,
-           { 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c, 0x0002000c } },
-       { 7, 0x989c,
-           { 0x00000094, 0x00000094, 0x00000094, 0x00000094, 0x00000094 } },
-       { 7, 0x989c,
-           { 0x00000091, 0x00000091, 0x00000091, 0x00000091, 0x00000091 } },
-       { 7, 0x989c,
-           { 0x0000000a, 0x0000000a, 0x00000012, 0x00000012, 0x00000012 } },
-       { 7, 0x989c,
-           { 0x00000080, 0x00000080, 0x00000080, 0x00000080, 0x00000080 } },
-       { 7, 0x989c,
-           { 0x000000c1, 0x000000c1, 0x000000c1, 0x000000c1, 0x000000c1 } },
-       { 7, 0x989c,
-           { 0x00000060, 0x00000060, 0x00000060, 0x00000060, 0x00000060 } },
-       { 7, 0x989c,
-           { 0x000000f0, 0x000000f0, 0x000000f0, 0x000000f0, 0x000000f0 } },
-       { 7, 0x989c,
-           { 0x00000022, 0x00000022, 0x00000022, 0x00000022, 0x00000022 } },
-       { 7, 0x989c,
-           { 0x00000092, 0x00000092, 0x00000092, 0x00000092, 0x00000092 } },
-       { 7, 0x989c,
-           { 0x000000d4, 0x000000d4, 0x000000d4, 0x000000d4, 0x000000d4 } },
-       { 7, 0x989c,
-           { 0x000014cc, 0x000014cc, 0x000014cc, 0x000014cc, 0x000014cc } },
-       { 7, 0x989c,
-           { 0x0000048c, 0x0000048c, 0x0000048c, 0x0000048c, 0x0000048c } },
-       { 7, 0x98c4,
-           { 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003 } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x03060408, 0x03060408, 0x03060408 } },
+       { 3, 0x98dc, { 0x00a0c0c0, 0x00e0c0c0, 0x00e0c0c0 } },
+       { 6, 0x989c, { 0x00a00000, 0x00a00000, 0x00a00000 } },
+       { 6, 0x989c, { 0x000a0000, 0x000a0000, 0x000a0000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00660000, 0x00660000, 0x00660000 } },
+       { 6, 0x989c, { 0x00db0000, 0x00db0000, 0x00db0000 } },
+       { 6, 0x989c, { 0x00f10000, 0x00f10000, 0x00f10000 } },
+       { 6, 0x989c, { 0x00120000, 0x00120000, 0x00120000 } },
+       { 6, 0x989c, { 0x00120000, 0x00120000, 0x00120000 } },
+       { 6, 0x989c, { 0x00730000, 0x00730000, 0x00730000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x000c0000, 0x000c0000, 0x000c0000 } },
+       { 6, 0x989c, { 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
+       { 6, 0x989c, { 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
+       { 6, 0x989c, { 0x008b0000, 0x008b0000, 0x008b0000 } },
+       { 6, 0x989c, { 0x00600000, 0x00600000, 0x00600000 } },
+       { 6, 0x989c, { 0x000c0000, 0x000c0000, 0x000c0000 } },
+       { 6, 0x989c, { 0x00840000, 0x00840000, 0x00840000 } },
+       { 6, 0x989c, { 0x00640000, 0x00640000, 0x00640000 } },
+       { 6, 0x989c, { 0x00200000, 0x00200000, 0x00200000 } },
+       { 6, 0x989c, { 0x00240000, 0x00240000, 0x00240000 } },
+       { 6, 0x989c, { 0x00250000, 0x00250000, 0x00250000 } },
+       { 6, 0x989c, { 0x00110000, 0x00110000, 0x00110000 } },
+       { 6, 0x989c, { 0x00110000, 0x00110000, 0x00110000 } },
+       { 6, 0x989c, { 0x00510000, 0x00510000, 0x00510000 } },
+       { 6, 0x989c, { 0x1c040000, 0x1c040000, 0x1c040000 } },
+       { 6, 0x989c, { 0x000a0000, 0x000a0000, 0x000a0000 } },
+       { 6, 0x989c, { 0x00a10000, 0x00a10000, 0x00a10000 } },
+       { 6, 0x989c, { 0x00400000, 0x00400000, 0x00400000 } },
+       { 6, 0x989c, { 0x03090000, 0x03090000, 0x03090000 } },
+       { 6, 0x989c, { 0x06000000, 0x06000000, 0x06000000 } },
+       { 6, 0x989c, { 0x000000b0, 0x000000a8, 0x000000a8 } },
+       { 6, 0x989c, { 0x0000002e, 0x0000002e, 0x0000002e } },
+       { 6, 0x989c, { 0x006c4a41, 0x006c4af1, 0x006c4a61 } },
+       { 6, 0x989c, { 0x0050892a, 0x0050892b, 0x0050892b } },
+       { 6, 0x989c, { 0x00842400, 0x00842400, 0x00842400 } },
+       { 6, 0x989c, { 0x00c69200, 0x00c69200, 0x00c69200 } },
+       { 6, 0x98d0, { 0x0002000c, 0x0002000c, 0x0002000c } },
+       { 7, 0x989c, { 0x00000094, 0x00000094, 0x00000094 } },
+       { 7, 0x989c, { 0x00000091, 0x00000091, 0x00000091 } },
+       { 7, 0x989c, { 0x0000000a, 0x00000012, 0x00000012 } },
+       { 7, 0x989c, { 0x00000080, 0x00000080, 0x00000080 } },
+       { 7, 0x989c, { 0x000000c1, 0x000000c1, 0x000000c1 } },
+       { 7, 0x989c, { 0x00000060, 0x00000060, 0x00000060 } },
+       { 7, 0x989c, { 0x000000f0, 0x000000f0, 0x000000f0 } },
+       { 7, 0x989c, { 0x00000022, 0x00000022, 0x00000022 } },
+       { 7, 0x989c, { 0x00000092, 0x00000092, 0x00000092 } },
+       { 7, 0x989c, { 0x000000d4, 0x000000d4, 0x000000d4 } },
+       { 7, 0x989c, { 0x000014cc, 0x000014cc, 0x000014cc } },
+       { 7, 0x989c, { 0x0000048c, 0x0000048c, 0x0000048c } },
+       { 7, 0x98c4, { 0x00000003, 0x00000003, 0x00000003 } },
 };
 
 /* RFX112A (Derby 2) */
@@ -515,119 +416,63 @@ static const struct ath5k_rf_reg rf_regs_5112a[] = {
 
 /* Default mode specific settings */
 static const struct ath5k_ini_rfbuffer rfb_5112a[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x03060408, 0x03070408, 0x03060408, 0x03060408, 0x03070408 } },
-       { 3, 0x98dc,
-           { 0x00a020c0, 0x00a020c0, 0x00e020c0, 0x00e020c0, 0x00e020c0 } },
-       { 6, 0x989c,
-           { 0x0f000000, 0x0f000000, 0x0f000000, 0x0f000000, 0x0f000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00800000, 0x00800000, 0x00800000, 0x00800000, 0x00800000 } },
-       { 6, 0x989c,
-           { 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000 } },
-       { 6, 0x989c,
-           { 0x00010000, 0x00010000, 0x00010000, 0x00010000, 0x00010000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00180000, 0x00180000, 0x00180000, 0x00180000, 0x00180000 } },
-       { 6, 0x989c,
-           { 0x00600000, 0x00600000, 0x006e0000, 0x006e0000, 0x006e0000 } },
-       { 6, 0x989c,
-           { 0x00c70000, 0x00c70000, 0x00c70000, 0x00c70000, 0x00c70000 } },
-       { 6, 0x989c,
-           { 0x004b0000, 0x004b0000, 0x004b0000, 0x004b0000, 0x004b0000 } },
-       { 6, 0x989c,
-           { 0x04480000, 0x04480000, 0x04480000, 0x04480000, 0x04480000 } },
-       { 6, 0x989c,
-           { 0x004c0000, 0x004c0000, 0x004c0000, 0x004c0000, 0x004c0000 } },
-       { 6, 0x989c,
-           { 0x00e40000, 0x00e40000, 0x00e40000, 0x00e40000, 0x00e40000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00fc0000, 0x00fc0000, 0x00fc0000, 0x00fc0000, 0x00fc0000 } },
-       { 6, 0x989c,
-           { 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
-       { 6, 0x989c,
-           { 0x043f0000, 0x043f0000, 0x043f0000, 0x043f0000, 0x043f0000 } },
-       { 6, 0x989c,
-           { 0x000c0000, 0x000c0000, 0x000c0000, 0x000c0000, 0x000c0000 } },
-       { 6, 0x989c,
-           { 0x02190000, 0x02190000, 0x02190000, 0x02190000, 0x02190000 } },
-       { 6, 0x989c,
-           { 0x00240000, 0x00240000, 0x00240000, 0x00240000, 0x00240000 } },
-       { 6, 0x989c,
-           { 0x00b40000, 0x00b40000, 0x00b40000, 0x00b40000, 0x00b40000 } },
-       { 6, 0x989c,
-           { 0x00990000, 0x00990000, 0x00990000, 0x00990000, 0x00990000 } },
-       { 6, 0x989c,
-           { 0x00500000, 0x00500000, 0x00500000, 0x00500000, 0x00500000 } },
-       { 6, 0x989c,
-           { 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000 } },
-       { 6, 0x989c,
-           { 0x00120000, 0x00120000, 0x00120000, 0x00120000, 0x00120000 } },
-       { 6, 0x989c,
-           { 0xc0320000, 0xc0320000, 0xc0320000, 0xc0320000, 0xc0320000 } },
-       { 6, 0x989c,
-           { 0x01740000, 0x01740000, 0x01740000, 0x01740000, 0x01740000 } },
-       { 6, 0x989c,
-           { 0x00110000, 0x00110000, 0x00110000, 0x00110000, 0x00110000 } },
-       { 6, 0x989c,
-           { 0x86280000, 0x86280000, 0x86280000, 0x86280000, 0x86280000 } },
-       { 6, 0x989c,
-           { 0x31840000, 0x31840000, 0x31840000, 0x31840000, 0x31840000 } },
-       { 6, 0x989c,
-           { 0x00f20080, 0x00f20080, 0x00f20080, 0x00f20080, 0x00f20080 } },
-       { 6, 0x989c,
-           { 0x00270019, 0x00270019, 0x00270019, 0x00270019, 0x00270019 } },
-       { 6, 0x989c,
-           { 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x000000b2, 0x000000b2, 0x000000b2, 0x000000b2, 0x000000b2 } },
-       { 6, 0x989c,
-           { 0x00b02084, 0x00b02084, 0x00b02084, 0x00b02084, 0x00b02084 } },
-       { 6, 0x989c,
-           { 0x004125a4, 0x004125a4, 0x004125a4, 0x004125a4, 0x004125a4 } },
-       { 6, 0x989c,
-           { 0x00119220, 0x00119220, 0x00119220, 0x00119220, 0x00119220 } },
-       { 6, 0x989c,
-           { 0x001a4800, 0x001a4800, 0x001a4800, 0x001a4800, 0x001a4800 } },
-       { 6, 0x98d8,
-           { 0x000b0230, 0x000b0230, 0x000b0230, 0x000b0230, 0x000b0230 } },
-       { 7, 0x989c,
-           { 0x00000094, 0x00000094, 0x00000094, 0x00000094, 0x00000094 } },
-       { 7, 0x989c,
-           { 0x00000091, 0x00000091, 0x00000091, 0x00000091, 0x00000091 } },
-       { 7, 0x989c,
-           { 0x00000012, 0x00000012, 0x00000012, 0x00000012, 0x00000012 } },
-       { 7, 0x989c,
-           { 0x00000080, 0x00000080, 0x00000080, 0x00000080, 0x00000080 } },
-       { 7, 0x989c,
-           { 0x000000d9, 0x000000d9, 0x000000d9, 0x000000d9, 0x000000d9 } },
-       { 7, 0x989c,
-           { 0x00000060, 0x00000060, 0x00000060, 0x00000060, 0x00000060 } },
-       { 7, 0x989c,
-           { 0x000000f0, 0x000000f0, 0x000000f0, 0x000000f0, 0x000000f0 } },
-       { 7, 0x989c,
-           { 0x000000a2, 0x000000a2, 0x000000a2, 0x000000a2, 0x000000a2 } },
-       { 7, 0x989c,
-           { 0x00000052, 0x00000052, 0x00000052, 0x00000052, 0x00000052 } },
-       { 7, 0x989c,
-           { 0x000000d4, 0x000000d4, 0x000000d4, 0x000000d4, 0x000000d4 } },
-       { 7, 0x989c,
-           { 0x000014cc, 0x000014cc, 0x000014cc, 0x000014cc, 0x000014cc } },
-       { 7, 0x989c,
-           { 0x0000048c, 0x0000048c, 0x0000048c, 0x0000048c, 0x0000048c } },
-       { 7, 0x98c4,
-           { 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003 } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x03060408, 0x03060408, 0x03060408 } },
+       { 3, 0x98dc, { 0x00a020c0, 0x00e020c0, 0x00e020c0 } },
+       { 6, 0x989c, { 0x0f000000, 0x0f000000, 0x0f000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00800000, 0x00800000, 0x00800000 } },
+       { 6, 0x989c, { 0x002a0000, 0x002a0000, 0x002a0000 } },
+       { 6, 0x989c, { 0x00010000, 0x00010000, 0x00010000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00180000, 0x00180000, 0x00180000 } },
+       { 6, 0x989c, { 0x00600000, 0x006e0000, 0x006e0000 } },
+       { 6, 0x989c, { 0x00c70000, 0x00c70000, 0x00c70000 } },
+       { 6, 0x989c, { 0x004b0000, 0x004b0000, 0x004b0000 } },
+       { 6, 0x989c, { 0x04480000, 0x04480000, 0x04480000 } },
+       { 6, 0x989c, { 0x004c0000, 0x004c0000, 0x004c0000 } },
+       { 6, 0x989c, { 0x00e40000, 0x00e40000, 0x00e40000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00fc0000, 0x00fc0000, 0x00fc0000 } },
+       { 6, 0x989c, { 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
+       { 6, 0x989c, { 0x043f0000, 0x043f0000, 0x043f0000 } },
+       { 6, 0x989c, { 0x000c0000, 0x000c0000, 0x000c0000 } },
+       { 6, 0x989c, { 0x02190000, 0x02190000, 0x02190000 } },
+       { 6, 0x989c, { 0x00240000, 0x00240000, 0x00240000 } },
+       { 6, 0x989c, { 0x00b40000, 0x00b40000, 0x00b40000 } },
+       { 6, 0x989c, { 0x00990000, 0x00990000, 0x00990000 } },
+       { 6, 0x989c, { 0x00500000, 0x00500000, 0x00500000 } },
+       { 6, 0x989c, { 0x002a0000, 0x002a0000, 0x002a0000 } },
+       { 6, 0x989c, { 0x00120000, 0x00120000, 0x00120000 } },
+       { 6, 0x989c, { 0xc0320000, 0xc0320000, 0xc0320000 } },
+       { 6, 0x989c, { 0x01740000, 0x01740000, 0x01740000 } },
+       { 6, 0x989c, { 0x00110000, 0x00110000, 0x00110000 } },
+       { 6, 0x989c, { 0x86280000, 0x86280000, 0x86280000 } },
+       { 6, 0x989c, { 0x31840000, 0x31840000, 0x31840000 } },
+       { 6, 0x989c, { 0x00f20080, 0x00f20080, 0x00f20080 } },
+       { 6, 0x989c, { 0x00270019, 0x00270019, 0x00270019 } },
+       { 6, 0x989c, { 0x00000003, 0x00000003, 0x00000003 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x000000b2, 0x000000b2, 0x000000b2 } },
+       { 6, 0x989c, { 0x00b02084, 0x00b02084, 0x00b02084 } },
+       { 6, 0x989c, { 0x004125a4, 0x004125a4, 0x004125a4 } },
+       { 6, 0x989c, { 0x00119220, 0x00119220, 0x00119220 } },
+       { 6, 0x989c, { 0x001a4800, 0x001a4800, 0x001a4800 } },
+       { 6, 0x98d8, { 0x000b0230, 0x000b0230, 0x000b0230 } },
+       { 7, 0x989c, { 0x00000094, 0x00000094, 0x00000094 } },
+       { 7, 0x989c, { 0x00000091, 0x00000091, 0x00000091 } },
+       { 7, 0x989c, { 0x00000012, 0x00000012, 0x00000012 } },
+       { 7, 0x989c, { 0x00000080, 0x00000080, 0x00000080 } },
+       { 7, 0x989c, { 0x000000d9, 0x000000d9, 0x000000d9 } },
+       { 7, 0x989c, { 0x00000060, 0x00000060, 0x00000060 } },
+       { 7, 0x989c, { 0x000000f0, 0x000000f0, 0x000000f0 } },
+       { 7, 0x989c, { 0x000000a2, 0x000000a2, 0x000000a2 } },
+       { 7, 0x989c, { 0x00000052, 0x00000052, 0x00000052 } },
+       { 7, 0x989c, { 0x000000d4, 0x000000d4, 0x000000d4 } },
+       { 7, 0x989c, { 0x000014cc, 0x000014cc, 0x000014cc } },
+       { 7, 0x989c, { 0x0000048c, 0x0000048c, 0x0000048c } },
+       { 7, 0x98c4, { 0x00000003, 0x00000003, 0x00000003 } },
 };
 
 
@@ -649,73 +494,40 @@ static const struct ath5k_rf_reg rf_regs_2413[] = {
  * XXX: a/aTurbo ???
  */
 static const struct ath5k_ini_rfbuffer rfb_2413[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x02001408, 0x02011408, 0x02001408, 0x02001408, 0x02011408 } },
-       { 3, 0x98dc,
-           { 0x00a020c0, 0x00a020c0, 0x00e020c0, 0x00e020c0, 0x00e020c0 } },
-       { 6, 0x989c,
-           { 0xf0000000, 0xf0000000, 0xf0000000, 0xf0000000, 0xf0000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x40400000, 0x40400000, 0x40400000, 0x40400000, 0x40400000 } },
-       { 6, 0x989c,
-           { 0x65050000, 0x65050000, 0x65050000, 0x65050000, 0x65050000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00420000, 0x00420000, 0x00420000, 0x00420000, 0x00420000 } },
-       { 6, 0x989c,
-           { 0x00b50000, 0x00b50000, 0x00b50000, 0x00b50000, 0x00b50000 } },
-       { 6, 0x989c,
-           { 0x00030000, 0x00030000, 0x00030000, 0x00030000, 0x00030000 } },
-       { 6, 0x989c,
-           { 0x00f70000, 0x00f70000, 0x00f70000, 0x00f70000, 0x00f70000 } },
-       { 6, 0x989c,
-           { 0x009d0000, 0x009d0000, 0x009d0000, 0x009d0000, 0x009d0000 } },
-       { 6, 0x989c,
-           { 0x00220000, 0x00220000, 0x00220000, 0x00220000, 0x00220000 } },
-       { 6, 0x989c,
-           { 0x04220000, 0x04220000, 0x04220000, 0x04220000, 0x04220000 } },
-       { 6, 0x989c,
-           { 0x00230018, 0x00230018, 0x00230018, 0x00230018, 0x00230018 } },
-       { 6, 0x989c,
-           { 0x00280000, 0x00280000, 0x00280060, 0x00280060, 0x00280060 } },
-       { 6, 0x989c,
-           { 0x005000c0, 0x005000c0, 0x005000c3, 0x005000c3, 0x005000c3 } },
-       { 6, 0x989c,
-           { 0x0004007f, 0x0004007f, 0x0004007f, 0x0004007f, 0x0004007f } },
-       { 6, 0x989c,
-           { 0x00000458, 0x00000458, 0x00000458, 0x00000458, 0x00000458 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x0000c000, 0x0000c000, 0x0000c000, 0x0000c000, 0x0000c000 } },
-       { 6, 0x98d8,
-           { 0x00400230, 0x00400230, 0x00400230, 0x00400230, 0x00400230 } },
-       { 7, 0x989c,
-           { 0x00006400, 0x00006400, 0x00006400, 0x00006400, 0x00006400 } },
-       { 7, 0x989c,
-           { 0x00000800, 0x00000800, 0x00000800, 0x00000800, 0x00000800 } },
-       { 7, 0x98cc,
-           { 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x02001408, 0x02001408, 0x02001408 } },
+       { 3, 0x98dc, { 0x00a020c0, 0x00e020c0, 0x00e020c0 } },
+       { 6, 0x989c, { 0xf0000000, 0xf0000000, 0xf0000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x03000000, 0x03000000, 0x03000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x40400000, 0x40400000, 0x40400000 } },
+       { 6, 0x989c, { 0x65050000, 0x65050000, 0x65050000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00420000, 0x00420000, 0x00420000 } },
+       { 6, 0x989c, { 0x00b50000, 0x00b50000, 0x00b50000 } },
+       { 6, 0x989c, { 0x00030000, 0x00030000, 0x00030000 } },
+       { 6, 0x989c, { 0x00f70000, 0x00f70000, 0x00f70000 } },
+       { 6, 0x989c, { 0x009d0000, 0x009d0000, 0x009d0000 } },
+       { 6, 0x989c, { 0x00220000, 0x00220000, 0x00220000 } },
+       { 6, 0x989c, { 0x04220000, 0x04220000, 0x04220000 } },
+       { 6, 0x989c, { 0x00230018, 0x00230018, 0x00230018 } },
+       { 6, 0x989c, { 0x00280000, 0x00280060, 0x00280060 } },
+       { 6, 0x989c, { 0x005000c0, 0x005000c3, 0x005000c3 } },
+       { 6, 0x989c, { 0x0004007f, 0x0004007f, 0x0004007f } },
+       { 6, 0x989c, { 0x00000458, 0x00000458, 0x00000458 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x0000c000, 0x0000c000, 0x0000c000 } },
+       { 6, 0x98d8, { 0x00400230, 0x00400230, 0x00400230 } },
+       { 7, 0x989c, { 0x00006400, 0x00006400, 0x00006400 } },
+       { 7, 0x989c, { 0x00000800, 0x00000800, 0x00000800 } },
+       { 7, 0x98cc, { 0x0000000e, 0x0000000e, 0x0000000e } },
 };
 
 
@@ -735,77 +547,42 @@ static const struct ath5k_rf_reg rf_regs_2316[] = {
 
 /* Default mode specific settings */
 static const struct ath5k_ini_rfbuffer rfb_2316[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x02001408, 0x02011408, 0x02001408, 0x02001408, 0x02011408 } },
-       { 3, 0x98dc,
-           { 0x00a020c0, 0x00a020c0, 0x00e020c0, 0x00e020c0, 0x00e020c0 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000 } },
-       { 6, 0x989c,
-           { 0x0f000000, 0x0f000000, 0x0f000000, 0x0f000000, 0x0f000000 } },
-       { 6, 0x989c,
-           { 0x02000000, 0x02000000, 0x02000000, 0x02000000, 0x02000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0xf8000000, 0xf8000000, 0xf8000000, 0xf8000000, 0xf8000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x95150000, 0x95150000, 0x95150000, 0x95150000, 0x95150000 } },
-       { 6, 0x989c,
-           { 0xc1000000, 0xc1000000, 0xc1000000, 0xc1000000, 0xc1000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00080000, 0x00080000, 0x00080000, 0x00080000, 0x00080000 } },
-       { 6, 0x989c,
-           { 0x00d50000, 0x00d50000, 0x00d50000, 0x00d50000, 0x00d50000 } },
-       { 6, 0x989c,
-           { 0x000e0000, 0x000e0000, 0x000e0000, 0x000e0000, 0x000e0000 } },
-       { 6, 0x989c,
-           { 0x00dc0000, 0x00dc0000, 0x00dc0000, 0x00dc0000, 0x00dc0000 } },
-       { 6, 0x989c,
-           { 0x00770000, 0x00770000, 0x00770000, 0x00770000, 0x00770000 } },
-       { 6, 0x989c,
-           { 0x008a0000, 0x008a0000, 0x008a0000, 0x008a0000, 0x008a0000 } },
-       { 6, 0x989c,
-           { 0x10880000, 0x10880000, 0x10880000, 0x10880000, 0x10880000 } },
-       { 6, 0x989c,
-           { 0x008c0060, 0x008c0060, 0x008c0060, 0x008c0060, 0x008c0060 } },
-       { 6, 0x989c,
-           { 0x00a00000, 0x00a00000, 0x00a00080, 0x00a00080, 0x00a00080 } },
-       { 6, 0x989c,
-           { 0x00400000, 0x00400000, 0x0040000d, 0x0040000d, 0x0040000d } },
-       { 6, 0x989c,
-           { 0x00110400, 0x00110400, 0x00110400, 0x00110400, 0x00110400 } },
-       { 6, 0x989c,
-           { 0x00000060, 0x00000060, 0x00000060, 0x00000060, 0x00000060 } },
-       { 6, 0x989c,
-           { 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001 } },
-       { 6, 0x989c,
-           { 0x00000b00, 0x00000b00, 0x00000b00, 0x00000b00, 0x00000b00 } },
-       { 6, 0x989c,
-           { 0x00000be8, 0x00000be8, 0x00000be8, 0x00000be8, 0x00000be8 } },
-       { 6, 0x98c0,
-           { 0x00010000, 0x00010000, 0x00010000, 0x00010000, 0x00010000 } },
-       { 7, 0x989c,
-           { 0x00006400, 0x00006400, 0x00006400, 0x00006400, 0x00006400 } },
-       { 7, 0x989c,
-           { 0x00000800, 0x00000800, 0x00000800, 0x00000800, 0x00000800 } },
-       { 7, 0x98cc,
-           { 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x02001408, 0x02001408, 0x02001408 } },
+       { 3, 0x98dc, { 0x00a020c0, 0x00e020c0, 0x00e020c0 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0xc0000000, 0xc0000000, 0xc0000000 } },
+       { 6, 0x989c, { 0x0f000000, 0x0f000000, 0x0f000000 } },
+       { 6, 0x989c, { 0x02000000, 0x02000000, 0x02000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0xf8000000, 0xf8000000, 0xf8000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x95150000, 0x95150000, 0x95150000 } },
+       { 6, 0x989c, { 0xc1000000, 0xc1000000, 0xc1000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00080000, 0x00080000, 0x00080000 } },
+       { 6, 0x989c, { 0x00d50000, 0x00d50000, 0x00d50000 } },
+       { 6, 0x989c, { 0x000e0000, 0x000e0000, 0x000e0000 } },
+       { 6, 0x989c, { 0x00dc0000, 0x00dc0000, 0x00dc0000 } },
+       { 6, 0x989c, { 0x00770000, 0x00770000, 0x00770000 } },
+       { 6, 0x989c, { 0x008a0000, 0x008a0000, 0x008a0000 } },
+       { 6, 0x989c, { 0x10880000, 0x10880000, 0x10880000 } },
+       { 6, 0x989c, { 0x008c0060, 0x008c0060, 0x008c0060 } },
+       { 6, 0x989c, { 0x00a00000, 0x00a00080, 0x00a00080 } },
+       { 6, 0x989c, { 0x00400000, 0x0040000d, 0x0040000d } },
+       { 6, 0x989c, { 0x00110400, 0x00110400, 0x00110400 } },
+       { 6, 0x989c, { 0x00000060, 0x00000060, 0x00000060 } },
+       { 6, 0x989c, { 0x00000001, 0x00000001, 0x00000001 } },
+       { 6, 0x989c, { 0x00000b00, 0x00000b00, 0x00000b00 } },
+       { 6, 0x989c, { 0x00000be8, 0x00000be8, 0x00000be8 } },
+       { 6, 0x98c0, { 0x00010000, 0x00010000, 0x00010000 } },
+       { 7, 0x989c, { 0x00006400, 0x00006400, 0x00006400 } },
+       { 7, 0x989c, { 0x00000800, 0x00000800, 0x00000800 } },
+       { 7, 0x98cc, { 0x0000000e, 0x0000000e, 0x0000000e } },
 };
 
 
@@ -835,93 +612,50 @@ static const struct ath5k_rf_reg rf_regs_5413[] = {
 
 /* Default mode specific settings */
 static const struct ath5k_ini_rfbuffer rfb_5413[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x00000008, 0x00000008, 0x00000008, 0x00000008, 0x00000008 } },
-       { 3, 0x98dc,
-           { 0x00a000c0, 0x00a000c0, 0x00e000c0, 0x00e000c0, 0x00e000c0 } },
-       { 6, 0x989c,
-           { 0x33000000, 0x33000000, 0x33000000, 0x33000000, 0x33000000 } },
-       { 6, 0x989c,
-           { 0x01000000, 0x01000000, 0x01000000, 0x01000000, 0x01000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x1f000000, 0x1f000000, 0x1f000000, 0x1f000000, 0x1f000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00b80000, 0x00b80000, 0x00b80000, 0x00b80000, 0x00b80000 } },
-       { 6, 0x989c,
-           { 0x00b70000, 0x00b70000, 0x00b70000, 0x00b70000, 0x00b70000 } },
-       { 6, 0x989c,
-           { 0x00840000, 0x00840000, 0x00840000, 0x00840000, 0x00840000 } },
-       { 6, 0x989c,
-           { 0x00980000, 0x00980000, 0x00980000, 0x00980000, 0x00980000 } },
-       { 6, 0x989c,
-           { 0x00c00000, 0x00c00000, 0x00c00000, 0x00c00000, 0x00c00000 } },
-       { 6, 0x989c,
-           { 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
-       { 6, 0x989c,
-           { 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
-       { 6, 0x989c,
-           { 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
-       { 6, 0x989c,
-           { 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
-       { 6, 0x989c,
-           { 0x00d70000, 0x00d70000, 0x00d70000, 0x00d70000, 0x00d70000 } },
-       { 6, 0x989c,
-           { 0x00610000, 0x00610000, 0x00610000, 0x00610000, 0x00610000 } },
-       { 6, 0x989c,
-           { 0x00fe0000, 0x00fe0000, 0x00fe0000, 0x00fe0000, 0x00fe0000 } },
-       { 6, 0x989c,
-           { 0x00de0000, 0x00de0000, 0x00de0000, 0x00de0000, 0x00de0000 } },
-       { 6, 0x989c,
-           { 0x007f0000, 0x007f0000, 0x007f0000, 0x007f0000, 0x007f0000 } },
-       { 6, 0x989c,
-           { 0x043d0000, 0x043d0000, 0x043d0000, 0x043d0000, 0x043d0000 } },
-       { 6, 0x989c,
-           { 0x00770000, 0x00770000, 0x00770000, 0x00770000, 0x00770000 } },
-       { 6, 0x989c,
-           { 0x00440000, 0x00440000, 0x00440000, 0x00440000, 0x00440000 } },
-       { 6, 0x989c,
-           { 0x00980000, 0x00980000, 0x00980000, 0x00980000, 0x00980000 } },
-       { 6, 0x989c,
-           { 0x00100080, 0x00100080, 0x00100080, 0x00100080, 0x00100080 } },
-       { 6, 0x989c,
-           { 0x0005c034, 0x0005c034, 0x0005c034, 0x0005c034, 0x0005c034 } },
-       { 6, 0x989c,
-           { 0x003100f0, 0x003100f0, 0x003100f0, 0x003100f0, 0x003100f0 } },
-       { 6, 0x989c,
-           { 0x000c011f, 0x000c011f, 0x000c011f, 0x000c011f, 0x000c011f } },
-       { 6, 0x989c,
-           { 0x00510040, 0x00510040, 0x00510040, 0x00510040, 0x00510040 } },
-       { 6, 0x989c,
-           { 0x005000da, 0x005000da, 0x005000da, 0x005000da, 0x005000da } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00004044, 0x00004044, 0x00004044, 0x00004044, 0x00004044 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x000060c0, 0x000060c0, 0x000060c0, 0x000060c0, 0x000060c0 } },
-       { 6, 0x989c,
-           { 0x00002c00, 0x00002c00, 0x00003600, 0x00003600, 0x00002c00 } },
-       { 6, 0x98c8,
-           { 0x00000403, 0x00000403, 0x00040403, 0x00040403, 0x00040403 } },
-       { 7, 0x989c,
-           { 0x00006400, 0x00006400, 0x00006400, 0x00006400, 0x00006400 } },
-       { 7, 0x989c,
-           { 0x00000800, 0x00000800, 0x00000800, 0x00000800, 0x00000800 } },
-       { 7, 0x98cc,
-           { 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x00000008, 0x00000008, 0x00000008 } },
+       { 3, 0x98dc, { 0x00a000c0, 0x00e000c0, 0x00e000c0 } },
+       { 6, 0x989c, { 0x33000000, 0x33000000, 0x33000000 } },
+       { 6, 0x989c, { 0x01000000, 0x01000000, 0x01000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x1f000000, 0x1f000000, 0x1f000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00b80000, 0x00b80000, 0x00b80000 } },
+       { 6, 0x989c, { 0x00b70000, 0x00b70000, 0x00b70000 } },
+       { 6, 0x989c, { 0x00840000, 0x00840000, 0x00840000 } },
+       { 6, 0x989c, { 0x00980000, 0x00980000, 0x00980000 } },
+       { 6, 0x989c, { 0x00c00000, 0x00c00000, 0x00c00000 } },
+       { 6, 0x989c, { 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
+       { 6, 0x989c, { 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
+       { 6, 0x989c, { 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
+       { 6, 0x989c, { 0x00ff0000, 0x00ff0000, 0x00ff0000 } },
+       { 6, 0x989c, { 0x00d70000, 0x00d70000, 0x00d70000 } },
+       { 6, 0x989c, { 0x00610000, 0x00610000, 0x00610000 } },
+       { 6, 0x989c, { 0x00fe0000, 0x00fe0000, 0x00fe0000 } },
+       { 6, 0x989c, { 0x00de0000, 0x00de0000, 0x00de0000 } },
+       { 6, 0x989c, { 0x007f0000, 0x007f0000, 0x007f0000 } },
+       { 6, 0x989c, { 0x043d0000, 0x043d0000, 0x043d0000 } },
+       { 6, 0x989c, { 0x00770000, 0x00770000, 0x00770000 } },
+       { 6, 0x989c, { 0x00440000, 0x00440000, 0x00440000 } },
+       { 6, 0x989c, { 0x00980000, 0x00980000, 0x00980000 } },
+       { 6, 0x989c, { 0x00100080, 0x00100080, 0x00100080 } },
+       { 6, 0x989c, { 0x0005c034, 0x0005c034, 0x0005c034 } },
+       { 6, 0x989c, { 0x003100f0, 0x003100f0, 0x003100f0 } },
+       { 6, 0x989c, { 0x000c011f, 0x000c011f, 0x000c011f } },
+       { 6, 0x989c, { 0x00510040, 0x00510040, 0x00510040 } },
+       { 6, 0x989c, { 0x005000da, 0x005000da, 0x005000da } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00004044, 0x00004044, 0x00004044 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x000060c0, 0x000060c0, 0x000060c0 } },
+       { 6, 0x989c, { 0x00002c00, 0x00003600, 0x00003600 } },
+       { 6, 0x98c8, { 0x00000403, 0x00040403, 0x00040403 } },
+       { 7, 0x989c, { 0x00006400, 0x00006400, 0x00006400 } },
+       { 7, 0x989c, { 0x00000800, 0x00000800, 0x00000800 } },
+       { 7, 0x98cc, { 0x0000000e, 0x0000000e, 0x0000000e } },
 };
 
 
@@ -944,79 +678,43 @@ static const struct ath5k_rf_reg rf_regs_2425[] = {
  * XXX: a/aTurbo ?
  */
 static const struct ath5k_ini_rfbuffer rfb_2425[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x02001408, 0x02001408, 0x02001408, 0x02001408, 0x02001408 } },
-       { 3, 0x98dc,
-           { 0x00a020c0, 0x00a020c0, 0x00e020c0, 0x00e020c0, 0x00e020c0 } },
-       { 6, 0x989c,
-           { 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00100000, 0x00100000, 0x00100000, 0x00100000, 0x00100000 } },
-       { 6, 0x989c,
-           { 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000 } },
-       { 6, 0x989c,
-           { 0x00730000, 0x00730000, 0x00730000, 0x00730000, 0x00730000 } },
-       { 6, 0x989c,
-           { 0x00f80000, 0x00f80000, 0x00f80000, 0x00f80000, 0x00f80000 } },
-       { 6, 0x989c,
-           { 0x00e70000, 0x00e70000, 0x00e70000, 0x00e70000, 0x00e70000 } },
-       { 6, 0x989c,
-           { 0x00140000, 0x00140000, 0x00140000, 0x00140000, 0x00140000 } },
-       { 6, 0x989c,
-           { 0x00910040, 0x00910040, 0x00910040, 0x00910040, 0x00910040 } },
-       { 6, 0x989c,
-           { 0x0007001a, 0x0007001a, 0x0007001a, 0x0007001a, 0x0007001a } },
-       { 6, 0x989c,
-           { 0x00410000, 0x00410000, 0x00410000, 0x00410000, 0x00410000 } },
-       { 6, 0x989c,
-           { 0x00810000, 0x00810000, 0x00810060, 0x00810060, 0x00810060 } },
-       { 6, 0x989c,
-           { 0x00020800, 0x00020800, 0x00020803, 0x00020803, 0x00020803 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00001660, 0x00001660, 0x00001660, 0x00001660, 0x00001660 } },
-       { 6, 0x989c,
-           { 0x00001688, 0x00001688, 0x00001688, 0x00001688, 0x00001688 } },
-       { 6, 0x98c4,
-           { 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001 } },
-       { 7, 0x989c,
-           { 0x00006400, 0x00006400, 0x00006400, 0x00006400, 0x00006400 } },
-       { 7, 0x989c,
-           { 0x00000800, 0x00000800, 0x00000800, 0x00000800, 0x00000800 } },
-       { 7, 0x98cc,
-           { 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x02001408, 0x02001408, 0x02001408 } },
+       { 3, 0x98dc, { 0x00a020c0, 0x00e020c0, 0x00e020c0 } },
+       { 6, 0x989c, { 0x10000000, 0x10000000, 0x10000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x002a0000, 0x002a0000, 0x002a0000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00100000, 0x00100000, 0x00100000 } },
+       { 6, 0x989c, { 0x00020000, 0x00020000, 0x00020000 } },
+       { 6, 0x989c, { 0x00730000, 0x00730000, 0x00730000 } },
+       { 6, 0x989c, { 0x00f80000, 0x00f80000, 0x00f80000 } },
+       { 6, 0x989c, { 0x00e70000, 0x00e70000, 0x00e70000 } },
+       { 6, 0x989c, { 0x00140000, 0x00140000, 0x00140000 } },
+       { 6, 0x989c, { 0x00910040, 0x00910040, 0x00910040 } },
+       { 6, 0x989c, { 0x0007001a, 0x0007001a, 0x0007001a } },
+       { 6, 0x989c, { 0x00410000, 0x00410000, 0x00410000 } },
+       { 6, 0x989c, { 0x00810000, 0x00810060, 0x00810060 } },
+       { 6, 0x989c, { 0x00020800, 0x00020803, 0x00020803 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00001660, 0x00001660, 0x00001660 } },
+       { 6, 0x989c, { 0x00001688, 0x00001688, 0x00001688 } },
+       { 6, 0x98c4, { 0x00000001, 0x00000001, 0x00000001 } },
+       { 7, 0x989c, { 0x00006400, 0x00006400, 0x00006400 } },
+       { 7, 0x989c, { 0x00000800, 0x00000800, 0x00000800 } },
+       { 7, 0x98cc, { 0x0000000e, 0x0000000e, 0x0000000e } },
 };
 
 /*
@@ -1024,79 +722,43 @@ static const struct ath5k_ini_rfbuffer rfb_2425[] = {
  * bank modification and get rid of this
  */
 static const struct ath5k_ini_rfbuffer rfb_2317[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x02001408, 0x02011408, 0x02001408, 0x02001408, 0x02011408 } },
-       { 3, 0x98dc,
-           { 0x00a020c0, 0x00a020c0, 0x00e020c0, 0x00e020c0, 0x00e020c0 } },
-       { 6, 0x989c,
-           { 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00100000, 0x00100000, 0x00100000, 0x00100000, 0x00100000 } },
-       { 6, 0x989c,
-           { 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000 } },
-       { 6, 0x989c,
-           { 0x00730000, 0x00730000, 0x00730000, 0x00730000, 0x00730000 } },
-       { 6, 0x989c,
-           { 0x00f80000, 0x00f80000, 0x00f80000, 0x00f80000, 0x00f80000 } },
-       { 6, 0x989c,
-           { 0x00e70000, 0x00e70000, 0x00e70000, 0x00e70000, 0x00e70000 } },
-       { 6, 0x989c,
-           { 0x00140100, 0x00140100, 0x00140100, 0x00140100, 0x00140100 } },
-       { 6, 0x989c,
-           { 0x00910040, 0x00910040, 0x00910040, 0x00910040, 0x00910040 } },
-       { 6, 0x989c,
-           { 0x0007001a, 0x0007001a, 0x0007001a, 0x0007001a, 0x0007001a } },
-       { 6, 0x989c,
-           { 0x00410000, 0x00410000, 0x00410000, 0x00410000, 0x00410000 } },
-       { 6, 0x989c,
-           { 0x00810000, 0x00810000, 0x00810060, 0x00810060, 0x00810060 } },
-       { 6, 0x989c,
-           { 0x00020800, 0x00020800, 0x00020803, 0x00020803, 0x00020803 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00001660, 0x00001660, 0x00001660, 0x00001660, 0x00001660 } },
-       { 6, 0x989c,
-           { 0x00009688, 0x00009688, 0x00009688, 0x00009688, 0x00009688 } },
-       { 6, 0x98c4,
-           { 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001 } },
-       { 7, 0x989c,
-           { 0x00006400, 0x00006400, 0x00006400, 0x00006400, 0x00006400 } },
-       { 7, 0x989c,
-           { 0x00000800, 0x00000800, 0x00000800, 0x00000800, 0x00000800 } },
-       { 7, 0x98cc,
-           { 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x02001408, 0x02001408, 0x02001408 } },
+       { 3, 0x98dc, { 0x00a020c0, 0x00e020c0, 0x00e020c0 } },
+       { 6, 0x989c, { 0x10000000, 0x10000000, 0x10000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x002a0000, 0x002a0000, 0x002a0000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00100000, 0x00100000, 0x00100000 } },
+       { 6, 0x989c, { 0x00020000, 0x00020000, 0x00020000 } },
+       { 6, 0x989c, { 0x00730000, 0x00730000, 0x00730000 } },
+       { 6, 0x989c, { 0x00f80000, 0x00f80000, 0x00f80000 } },
+       { 6, 0x989c, { 0x00e70000, 0x00e70000, 0x00e70000 } },
+       { 6, 0x989c, { 0x00140100, 0x00140100, 0x00140100 } },
+       { 6, 0x989c, { 0x00910040, 0x00910040, 0x00910040 } },
+       { 6, 0x989c, { 0x0007001a, 0x0007001a, 0x0007001a } },
+       { 6, 0x989c, { 0x00410000, 0x00410000, 0x00410000 } },
+       { 6, 0x989c, { 0x00810000, 0x00810060, 0x00810060 } },
+       { 6, 0x989c, { 0x00020800, 0x00020803, 0x00020803 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00001660, 0x00001660, 0x00001660 } },
+       { 6, 0x989c, { 0x00009688, 0x00009688, 0x00009688 } },
+       { 6, 0x98c4, { 0x00000001, 0x00000001, 0x00000001 } },
+       { 7, 0x989c, { 0x00006400, 0x00006400, 0x00006400 } },
+       { 7, 0x989c, { 0x00000800, 0x00000800, 0x00000800 } },
+       { 7, 0x98cc, { 0x0000000e, 0x0000000e, 0x0000000e } },
 };
 
 /*
@@ -1105,77 +767,41 @@ static const struct ath5k_ini_rfbuffer rfb_2317[] = {
  * XXX: a/aTurbo ?
  */
 static const struct ath5k_ini_rfbuffer rfb_2417[] = {
-       { 1, 0x98d4,
-       /*     mode a/XR  mode aTurbo    mode b     mode g    mode gTurbo */
-           { 0x00000020, 0x00000020, 0x00000020, 0x00000020, 0x00000020 } },
-       { 2, 0x98d0,
-           { 0x02001408, 0x02001408, 0x02001408, 0x02001408, 0x02001408 } },
-       { 3, 0x98dc,
-           { 0x00a020c0, 0x00a020c0, 0x00e020c0, 0x00e020c0, 0x00e020c0 } },
-       { 6, 0x989c,
-           { 0x10000000, 0x10000000, 0x10000000, 0x10000000, 0x10000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000, 0x002a0000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00100000, 0x00100000, 0x00100000, 0x00100000, 0x00100000 } },
-       { 6, 0x989c,
-           { 0x00020000, 0x00020000, 0x00020000, 0x00020000, 0x00020000 } },
-       { 6, 0x989c,
-           { 0x00730000, 0x00730000, 0x00730000, 0x00730000, 0x00730000 } },
-       { 6, 0x989c,
-           { 0x00f80000, 0x00f80000, 0x00f80000, 0x00f80000, 0x00f80000 } },
-       { 6, 0x989c,
-           { 0x00e70000, 0x00e70000, 0x80e70000, 0x80e70000, 0x00e70000 } },
-       { 6, 0x989c,
-           { 0x00140000, 0x00140000, 0x00140000, 0x00140000, 0x00140000 } },
-       { 6, 0x989c,
-           { 0x00910040, 0x00910040, 0x00910040, 0x00910040, 0x00910040 } },
-       { 6, 0x989c,
-           { 0x0007001a, 0x0007001a, 0x0207001a, 0x0207001a, 0x0007001a } },
-       { 6, 0x989c,
-           { 0x00410000, 0x00410000, 0x00410000, 0x00410000, 0x00410000 } },
-       { 6, 0x989c,
-           { 0x00810000, 0x00810000, 0x00810060, 0x00810060, 0x00810060 } },
-       { 6, 0x989c,
-           { 0x00020800, 0x00020800, 0x00020803, 0x00020803, 0x00020803 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000 } },
-       { 6, 0x989c,
-           { 0x00001660, 0x00001660, 0x00001660, 0x00001660, 0x00001660 } },
-       { 6, 0x989c,
-           { 0x00001688, 0x00001688, 0x00001688, 0x00001688, 0x00001688 } },
-       { 6, 0x98c4,
-           { 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000001 } },
-       { 7, 0x989c,
-           { 0x00006400, 0x00006400, 0x00006400, 0x00006400, 0x00006400 } },
-       { 7, 0x989c,
-           { 0x00000800, 0x00000800, 0x00000800, 0x00000800, 0x00000800 } },
-       { 7, 0x98cc,
-           { 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e, 0x0000000e } },
+       /* BANK / C.R.     A/XR         B           G      */
+       { 1, 0x98d4, { 0x00000020, 0x00000020, 0x00000020 } },
+       { 2, 0x98d0, { 0x02001408, 0x02001408, 0x02001408 } },
+       { 3, 0x98dc, { 0x00a020c0, 0x00e020c0, 0x00e020c0 } },
+       { 6, 0x989c, { 0x10000000, 0x10000000, 0x10000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x002a0000, 0x002a0000, 0x002a0000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00100000, 0x00100000, 0x00100000 } },
+       { 6, 0x989c, { 0x00020000, 0x00020000, 0x00020000 } },
+       { 6, 0x989c, { 0x00730000, 0x00730000, 0x00730000 } },
+       { 6, 0x989c, { 0x00f80000, 0x00f80000, 0x00f80000 } },
+       { 6, 0x989c, { 0x00e70000, 0x80e70000, 0x80e70000 } },
+       { 6, 0x989c, { 0x00140000, 0x00140000, 0x00140000 } },
+       { 6, 0x989c, { 0x00910040, 0x00910040, 0x00910040 } },
+       { 6, 0x989c, { 0x0007001a, 0x0207001a, 0x0207001a } },
+       { 6, 0x989c, { 0x00410000, 0x00410000, 0x00410000 } },
+       { 6, 0x989c, { 0x00810000, 0x00810060, 0x00810060 } },
+       { 6, 0x989c, { 0x00020800, 0x00020803, 0x00020803 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00000000, 0x00000000, 0x00000000 } },
+       { 6, 0x989c, { 0x00001660, 0x00001660, 0x00001660 } },
+       { 6, 0x989c, { 0x00001688, 0x00001688, 0x00001688 } },
+       { 6, 0x98c4, { 0x00000001, 0x00000001, 0x00000001 } },
+       { 7, 0x989c, { 0x00006400, 0x00006400, 0x00006400 } },
+       { 7, 0x989c, { 0x00000800, 0x00000800, 0x00000800 } },
+       { 7, 0x98cc, { 0x0000000e, 0x0000000e, 0x0000000e } },
 };