diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2010-06-12 00:33:43 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-06-14 15:39:29 -0400 |
commit | 7ca710d58ee9018e4f18bdeb5b6e5dc50097ce14 (patch) | |
tree | 86914d6d6b5d5b2edc098086f115072cba814cfa | |
parent | ac0bb76791ce2550e3c0a658408c344e1e231e3d (diff) |
ath9k_hw: add register definitions for the new ANI
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9002_phy.h | 7 | ||||
-rw-r--r-- | drivers/net/wireless/ath/ath9k/ar9003_phy.h | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ar9002_phy.h b/drivers/net/wireless/ath/ath9k/ar9002_phy.h index 81bf6e5840e1..ce8bb001c6d1 100644 --- a/drivers/net/wireless/ath/ath9k/ar9002_phy.h +++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.h | |||
@@ -114,6 +114,10 @@ | |||
114 | #define AR_PHY_FIND_SIG_FIRPWR 0x03FC0000 | 114 | #define AR_PHY_FIND_SIG_FIRPWR 0x03FC0000 |
115 | #define AR_PHY_FIND_SIG_FIRPWR_S 18 | 115 | #define AR_PHY_FIND_SIG_FIRPWR_S 18 |
116 | 116 | ||
117 | #define AR_PHY_FIND_SIG_LOW 0x9840 | ||
118 | #define AR_PHY_FIND_SIG_FIRSTEP_LOW 0x00000FC0L | ||
119 | #define AR_PHY_FIND_SIG_FIRSTEP_LOW_S 6 | ||
120 | |||
117 | #define AR_PHY_AGC_CTL1 0x985C | 121 | #define AR_PHY_AGC_CTL1 0x985C |
118 | #define AR_PHY_AGC_CTL1_COARSE_LOW 0x00007F80 | 122 | #define AR_PHY_AGC_CTL1_COARSE_LOW 0x00007F80 |
119 | #define AR_PHY_AGC_CTL1_COARSE_LOW_S 7 | 123 | #define AR_PHY_AGC_CTL1_COARSE_LOW_S 7 |
@@ -325,6 +329,9 @@ | |||
325 | #define AR_PHY_EXT_CCA_CYCPWR_THR1_S 9 | 329 | #define AR_PHY_EXT_CCA_CYCPWR_THR1_S 9 |
326 | #define AR_PHY_EXT_CCA_THRESH62 0x007F0000 | 330 | #define AR_PHY_EXT_CCA_THRESH62 0x007F0000 |
327 | #define AR_PHY_EXT_CCA_THRESH62_S 16 | 331 | #define AR_PHY_EXT_CCA_THRESH62_S 16 |
332 | #define AR_PHY_EXT_TIMING5_CYCPWR_THR1 0x0000FE00L | ||
333 | #define AR_PHY_EXT_TIMING5_CYCPWR_THR1_S 9 | ||
334 | |||
328 | #define AR_PHY_EXT_MINCCA_PWR 0xFF800000 | 335 | #define AR_PHY_EXT_MINCCA_PWR 0xFF800000 |
329 | #define AR_PHY_EXT_MINCCA_PWR_S 23 | 336 | #define AR_PHY_EXT_MINCCA_PWR_S 23 |
330 | #define AR9280_PHY_EXT_MINCCA_PWR 0x01FF0000 | 337 | #define AR9280_PHY_EXT_MINCCA_PWR 0x01FF0000 |
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h index 676d3f1123f4..265f59f029d7 100644 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h | |||
@@ -149,6 +149,8 @@ | |||
149 | #define AR_PHY_EXT_CCA_THRESH62_S 16 | 149 | #define AR_PHY_EXT_CCA_THRESH62_S 16 |
150 | #define AR_PHY_EXT_MINCCA_PWR 0x01FF0000 | 150 | #define AR_PHY_EXT_MINCCA_PWR 0x01FF0000 |
151 | #define AR_PHY_EXT_MINCCA_PWR_S 16 | 151 | #define AR_PHY_EXT_MINCCA_PWR_S 16 |
152 | #define AR_PHY_EXT_CYCPWR_THR1 0x0000FE00L | ||
153 | #define AR_PHY_EXT_CYCPWR_THR1_S 9 | ||
152 | #define AR_PHY_TIMING5_CYCPWR_THR1 0x000000FE | 154 | #define AR_PHY_TIMING5_CYCPWR_THR1 0x000000FE |
153 | #define AR_PHY_TIMING5_CYCPWR_THR1_S 1 | 155 | #define AR_PHY_TIMING5_CYCPWR_THR1_S 1 |
154 | #define AR_PHY_TIMING5_CYCPWR_THR1_ENABLE 0x00000001 | 156 | #define AR_PHY_TIMING5_CYCPWR_THR1_ENABLE 0x00000001 |
@@ -283,6 +285,12 @@ | |||
283 | #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ 0x1ffffe00 | 285 | #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ 0x1ffffe00 |
284 | #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ_S 9 | 286 | #define AR_PHY_CCK_SPUR_MIT_CCK_SPUR_FREQ_S 9 |
285 | 287 | ||
288 | #define AR_PHY_MRC_CCK_CTRL (AR_AGC_BASE + 0x1d0) | ||
289 | #define AR_PHY_MRC_CCK_ENABLE 0x00000001 | ||
290 | #define AR_PHY_MRC_CCK_ENABLE_S 0 | ||
291 | #define AR_PHY_MRC_CCK_MUX_REG 0x00000002 | ||
292 | #define AR_PHY_MRC_CCK_MUX_REG_S 1 | ||
293 | |||
286 | #define AR_PHY_RX_OCGAIN (AR_AGC_BASE + 0x200) | 294 | #define AR_PHY_RX_OCGAIN (AR_AGC_BASE + 0x200) |
287 | 295 | ||
288 | #define AR_PHY_CCA_NOM_VAL_9300_2GHZ -110 | 296 | #define AR_PHY_CCA_NOM_VAL_9300_2GHZ -110 |